l10n daemon script 7a14a0ef4d 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-05-12 05:44:57 +02:00
..
CMakeLists.txt
kwinscripts.desktop
kwinscripts.knsrc
main.cpp
Messages.sh
module.cpp
module.h
module.ui
version.h.cmake