l10n daemon script 286ad7104d 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-12-23 05:44:53 +01:00
..
thumbnails
CMakeLists.txt
kwinswitcher.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-23 05:44:53 +01:00
kwintabbox.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-20 13:30:44 +01:00
layoutpreview.cpp
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