kwin/effects/fade/package
l10n daemon script 75f3964db7 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-10-25 10:45:05 +00:00
..
contents don't do fadeout on ksplashqml 2014-04-23 13:24:37 +02:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-10-25 10:45:05 +00:00