kwin/kcmkwin/kwindecoration
l10n daemon script 2bb025cbdb 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"
2019-11-02 05:41:14 +01:00
..
declarative-plugin Add some const & 2019-10-30 19:23:01 +01:00
package SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-02 05:41:14 +01:00
CMakeLists.txt Cleanup style in CMakeLists.txt files 2019-09-17 16:03:05 +03:00
decorationmodel.cpp [decorations] Let KDecoration plugins recommend a border size per default 2019-06-06 22:24:45 +02:00
decorationmodel.h Run clang-tidy with modernize-use-override check 2019-07-22 20:03:22 +03:00
kcm.cpp [decorations] Let KDecoration plugins recommend a border size per default 2019-06-06 22:24:45 +02:00
kcm.h [decorations] Let KDecoration plugins recommend a border size per default 2019-06-06 22:24:45 +02:00
kwindecoration.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-02 05:41:14 +01:00
Messages.sh Merge branch 'Plasma/5.15' 2019-02-12 08:56:17 +01:00
utils.cpp [kcmkwin/kwindecoration] Rewrite the KWin decorations settings as a ConfigModule 2019-02-10 13:01:04 +01:00
utils.h [kcmkwin/kwindecoration] Rewrite the KWin decorations settings as a ConfigModule 2019-02-10 13:01:04 +01:00
window-decorations.knsrc SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-17 05:41:38 +02:00