l10n daemon script aa58a8c4dd 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-11-17 06:02:16 +01:00
..
contents/code	[effects] Split the Fade effect	2018-11-15 19:01:33 +02:00
CMakeLists.txt	[effects] Split the Fade effect	2018-11-15 19:01:33 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-17 06:02:16 +01:00