kwin/packageplugins
l10n daemon script 4c3404e150 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-04-16 04:05:25 +02:00
..
aurorae SVN_SILENT made messages (.desktop file) - always resolve ours 2017-04-08 04:20:31 +02:00
decoration SVN_SILENT made messages (.desktop file) - always resolve ours 2017-04-16 04:05:25 +02:00
scripts SVN_SILENT made messages (.desktop file) - always resolve ours 2017-04-16 04:05:25 +02:00
windowswitcher SVN_SILENT made messages (.desktop file) - always resolve ours 2017-04-16 04:05:25 +02:00
CMakeLists.txt add packagestructure for KWin/Decoration 2017-03-15 13:09:34 +01:00