l10n daemon script 4e10c99084 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-11-02 08:22:48 +01: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
kcm.h
kcm.ui
kwindecoration.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-02 08:22:48 +01:00
Messages.sh