You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
l10n daemon script a58e788f3c 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"
9 years ago
..
declarative-plugin [kcmkwin/deco] Delay deleting of PreviewBridge 9 years ago
qml Merge branch 'Plasma/5.4' 9 years ago
CMakeLists.txt [kcmkwin/deco] Drop outdated source and ui files 10 years ago
Messages.sh extract the strings also from QML 10 years ago
decorationmodel.cpp [kcmkwin/deco] Add configuration for decoration plugin/themes 10 years ago
decorationmodel.h [kcmkwin/deco] Add configuration for decoration plugin/themes 10 years ago
kcm.cpp overhaul of deco kcm 9 years ago
kcm.h use xembed for the qml view of window decorations modul 10 years ago
kcm.ui overhaul of deco kcm 9 years ago
kwindecoration.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago