l10n daemon script 9c0a71c37f 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"		2019-07-13 05:18:09 +02:00
..
CMakeLists.txt	Move knsrc files to the new location	2019-05-17 18:56:27 +02:00
kwinscripts.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-13 05:18:09 +02:00
kwinscripts.knsrc
main.cpp
Messages.sh
module.cpp
module.h
module.ui
version.h.cmake