l10n daemon script 6b0d2fc027 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"		2018-06-18 05:35:02 +02:00
..
CMakeLists.txt
kwinscripts.desktop
kwinscripts.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-18 05:35:02 +02:00
main.cpp
Messages.sh
module.cpp	Remove Qt module declarations in includes	2018-06-05 18:07:23 +01:00
module.h
module.ui
version.h.cmake