l10n daemon script e6cf2e3efe 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-11-14 06:08:44 +01:00
..
contents	[effects/scale] Put 'use strict' at the beginning of the script	2018-11-05 11:28:20 +02:00
CMakeLists.txt	Fix test of scriptedeffectsloader when run from build directory without install	2018-11-07 09:34:18 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-14 06:08:44 +01:00