l10n daemon script b6f22a98a7 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-06-18 07:51:12 +02:00
..
declarative-plugin	Make it possible to compile 5.12 branch with a kdecoration from master	2018-02-07 19:43:53 +01:00
qml	Fix KWin decoration KCM showing correct index at startup	2017-04-13 11:54:39 +01:00
CMakeLists.txt
decorationmodel.cpp
decorationmodel.h
kcm.cpp	Sort the themes in decoration KCM	2017-04-13 11:54:44 +01:00
kcm.h	Fix KWin decoration KCM showing correct index at startup	2017-04-13 11:54:39 +01:00
kcm.ui	overhaul of deco kcm	2015-10-05 23:40:46 +02:00
kwindecoration.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-18 07:51:12 +02:00
Messages.sh