l10n daemon script 8725f2441e 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"		2017-03-22 05:17:38 +01:00
..
contents/code	Ensure that all Effects honour the grab roles correctly	2016-11-07 11:45:09 +01:00
CMakeLists.txt
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-03-22 05:17:38 +01:00