l10n daemon script 344650fe5d 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"		2016-06-21 10:41:58 +00:00
..
contents/code	try more aggressively to retarget	2016-02-26 10:28:47 +01:00
CMakeLists.txt	Morphingpopups effect, to animate tooltips	2016-02-17 15:03:55 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-06-21 10:41:58 +00:00