kwin/effects/fadedesktop
l10n daemon script 8725f2441e 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"
2017-03-22 05:17:38 +01:00
..
package SVN_SILENT made messages (.desktop file) - always resolve ours 2017-03-22 05:17:38 +01:00
CMakeLists.txt