l10n daemon script c85a2227b7 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-10-23 09:29:41 +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	[kcmkwin] Use QtQuick.Controls 2.0 for Label and TextField	2018-08-15 11:31:00 +03: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
kcm.ui
kwindecoration.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-23 09:29:41 +02:00
Messages.sh