kwin/kcmkwin/kwindecoration
l10n daemon script 430ca2a33e 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"
2020-06-18 08:32:20 +02:00
..
declarative-plugin Merge branch 'Plasma/5.18' 2020-05-06 15:15:42 +02:00
package SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
CMakeLists.txt KCM KWinDecoration port to KConfigXT 2020-01-14 11:01:10 +01:00
decorationmodel.cpp
decorationmodel.h
kcm.cpp KCM KWinDecoration port to KConfigXT 2020-01-14 11:01:10 +01:00
kcm.h KCM KWinDecoration port to KConfigXT 2020-01-14 11:01:10 +01:00
kwindecoration.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00
kwindecorationsettings.kcfg [kcms/kwindecoration] Fix saving of window decoration plugin 2020-01-21 18:41:59 +00:00
kwindecorationsettings.kcfgc Notify about decorations button order change 2020-03-07 15:19:24 +03:00
Messages.sh Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01:00
utils.cpp KCM KWinDecoration port to KConfigXT 2020-01-14 11:01:10 +01:00
utils.h KCM KWinDecoration port to KConfigXT 2020-01-14 11:01:10 +01:00
window-decorations.knsrc SVN_SILENT made messages (.desktop file) - always resolve ours 2020-06-18 08:32:20 +02:00