l10n daemon script 01b61a9ede 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"		2015-03-16 10:12:25 +00:00
..
thumbnails
CMakeLists.txt
kwinswitcher.knsrc	Fix installation of GHNS material	2015-03-13 15:51:20 +01:00
kwintabbox.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-03-16 10:12:25 +00:00
layoutpreview.cpp	[kcmkwin/tabbox] Improve locating the services used in preview mode	2015-01-20 15:25:16 +01:00
layoutpreview.h	[kcmkwin/tabbox] Improve locating the services used in preview mode	2015-01-20 15:25:16 +01:00
main.cpp	Fix loading of effect config plugins	2015-03-06 13:16:17 +01:00
main.h
main.ui
Messages.sh
thumbnailitem.cpp
thumbnailitem.h