kwin/effects/fade/package
l10n daemon script bb7051dd3a 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"
2019-10-18 05:38:34 +02:00
..
contents [wayland] Make sure that only the fading popups effect animates outline 2019-04-09 14:21:22 +03:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-18 05:38:34 +02:00