l10n daemon script 516ad25658 SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"		2017-01-15 07:48:05 +01:00
..
thumbnails
CMakeLists.txt	Port Plasma::Package to KPackage	2016-12-26 17:41:06 +01:00
kwinswitcher.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-01-15 07:48:05 +01:00
kwintabbox.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-20 13:30:44 +01:00
layoutpreview.cpp	[kcmkwin/tabbox] static_cast QKeyEvent	2015-03-25 08:18:12 +01:00
layoutpreview.h	[kcmkwin/tabbox] Improve locating the services used in preview mode	2015-01-20 15:25:16 +01:00
main.cpp	Port Plasma::Package to KPackage	2016-12-26 17:41:06 +01:00
main.h
main.ui
Messages.sh
thumbnailitem.cpp
thumbnailitem.h