l10n daemon script 2d0f08b006 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-03-28 09:41:02 +02:00
..
thumbnails
CMakeLists.txt
kwinswitcher.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-03-28 09:41:02 +02:00
kwintabbox.desktop
layoutpreview.cpp
layoutpreview.h
main.cpp
main.h
main.ui
Messages.sh
thumbnailitem.cpp
thumbnailitem.h