l10n daemon script 6fb78e9d1e 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-08-16 11:04:26 +02:00
..
contents/code	[effects/logout] Animate the disappearing of the logout screen	2018-08-07 20:30:56 +03:00
CMakeLists.txt
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-08-16 11:04:26 +02:00