kwin/packageplugins
l10n daemon script 6b0d2fc027 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-06-18 05:35:02 +02:00
..
aurorae SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 05:35:02 +02:00
decoration SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 05:35:02 +02:00
scripts SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 05:35:02 +02:00
windowswitcher SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 05:35:02 +02:00
CMakeLists.txt