l10n daemon script a1c0d43deb 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-07-23 06:10:20 +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-07-23 06:10:20 +02:00
kwincompositing_setting.kcfg	KCM/Compositing: Use KConfig XT in UI	2020-04-20 10:12:05 +02:00
kwincompositing_setting.kcfgc	KCM/Compositing: Use KConfig XT to store values	2020-03-30 09:14:25 +02:00
main.cpp	KCM Compositing: Fix save state	2020-06-22 09:24:11 +02:00
Messages.sh	GIT_SILENT Fix scripty failing	2020-04-21 23:11:15 +02:00