l10n daemon script aa0f2c88f0 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"		2016-01-10 11:46:53 +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	2016-01-10 11:46:53 +00:00
layoutpreview.cpp	[kcmkwin/tabbox] static_cast QKeyEvent	2015-03-25 08:18:12 +01:00
layoutpreview.h
main.cpp	optimize string operations	2015-11-05 14:14:06 +00:00
main.h
main.ui
Messages.sh
thumbnailitem.cpp
thumbnailitem.h