l10n daemon script d8addb6b3a 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"		2018-06-18 07:25:30 +02: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	2018-06-18 07:25:30 +02:00
kwintabbox.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-18 07:25:30 +02: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	use proper packagestructures	2017-01-20 15:34:56 +01:00
main.h
main.ui
Messages.sh
thumbnailitem.cpp
thumbnailitem.h