l10n daemon script 7230c95320 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-05-31 20:24:40 +02:00
..
CMakeLists.txt	KCM/Compositing: Use KConfig XT in UI	2020-04-20 10:12:05 +02:00
compositing.ui	KCM/Compositing: Use KConfig XT in UI	2020-04-20 10:12:05 +02:00
kwincompositing.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-05-31 20:24:40 +02:00
kwincompositing_setting.kcfg	KCM/Compositing: Use KConfig XT in UI	2020-04-20 10:12:05 +02:00
kwincompositing_setting.kcfgc
main.cpp	KCM/Compositing: Use KConfig XT in UI	2020-04-20 10:12:05 +02:00
Messages.sh	GIT_SILENT Fix scripty failing	2020-04-21 23:11:15 +02:00