l10n daemon script 54b654dcad 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"		2020-09-17 06:21:21 +02:00
..
CMakeLists.txt
compositing.ui
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-17 06:21:21 +02:00
kwincompositing_setting.kcfg
kwincompositing_setting.kcfgc
main.cpp
Messages.sh