l10n daemon script ccc69e8105 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-07-26 08:52:42 +02:00
..
contents/code	Desaturate non-responsive windows	2017-04-05 11:16:23 +02:00
CMakeLists.txt	Desaturate non-responsive windows	2017-04-05 11:16:23 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-07-26 08:52:42 +02:00