l10n daemon script 8026da5309 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-11 05:58:24 +02:00
..
CMakeLists.txt
compositing.ui
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-11 05:58:24 +02:00
kwincompositing_setting.kcfg
kwincompositing_setting.kcfgc
main.cpp	Prettify license headers	2020-08-07 19:57:56 +00:00
Messages.sh	GIT_SILENT Fix scripty failing	2020-04-21 23:11:15 +02:00