l10n daemon script da6b89dda0 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-12-07 08:23:17 +01:00
..
contents/code	[effects/logout] Animate ksmserver-logout-greeter	2018-08-19 22:12:00 +03:00
CMakeLists.txt	new logout effect	2017-03-15 17:47:22 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-12-07 08:23:17 +01:00