kwin/effects/morphingpopups/package
l10n daemon script cd6f56a443 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-08-11 05:34:25 +02:00
..
contents/code Convert JS files to UTF-8 (from ISO-8859-15) 2018-04-30 23:37:10 +02:00
CMakeLists.txt
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-08-11 05:34:25 +02:00