kwin/kcmkwin/kwindecoration
l10n daemon script ba0b34c755 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-11-22 06:02:11 +01:00
..
declarative-plugin [kcmkwin/kwindecoration] Add missing QT include 2018-07-26 10:04:41 -07:00
qml Merge branch 'Plasma/5.12' into Plasma/5.13 2018-08-15 11:34:03 +03:00
CMakeLists.txt
decorationmodel.cpp
decorationmodel.h Fix minor EBN issues 2018-08-29 21:02:16 +03:00
kcm.cpp Fix KDeclarative::setupBindings() deprecation warnings 2018-07-02 12:46:00 +03:00
kcm.h Fix KWin decoration KCM showing correct index at startup 2017-04-13 11:54:39 +01:00
kcm.ui [KCMs] move GHNS buttons to the normal location 2018-10-31 07:29:22 -06:00
kwindecoration.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-11-22 06:02:11 +01:00
Messages.sh