kwin/packageplugins/decoration
l10n daemon script ec11cfd04f 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-07-30 04:57:22 +02:00
..
CMakeLists.txt add packagestructure for KWin/Decoration 2017-03-15 13:09:34 +01:00
decoration.cpp add packagestructure for KWin/Decoration 2017-03-15 13:09:34 +01:00
decoration.h add packagestructure for KWin/Decoration 2017-03-15 13:09:34 +01:00
kwin-packagestructure-decoration.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2017-07-30 04:57:22 +02:00