l10n daemon script 8154ba1cdc 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-10-31 08:05:22 +01:00
..
CMakeLists.txt
scale.cpp	[effects/logout] Animate ksmserver-logout-greeter	2018-08-19 22:12:00 +03:00
scale.h
scale.kcfg
scale_config.cpp
scale_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-31 08:05:22 +01:00
scale_config.h
scale_config.ui
scaleconfig.kcfgc