l10n daemon script 99c3e5c290 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"		2015-11-06 12:18:24 +00:00
..
contents/code	Maximize effect: skip crossfadign on user resizes	2015-06-03 21:17:54 +02:00
CMakeLists.txt	New Maximize Window Effect	2012-10-28 09:51:01 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-11-06 12:18:24 +00:00