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"		2015-12-10 09:14:26 +00:00
..
declarative-plugin
qml	Merge branch 'Plasma/5.4'	2015-10-21 08:11:38 +02:00
CMakeLists.txt
decorationmodel.cpp
decorationmodel.h
kcm.cpp
kcm.h
kcm.ui
kwindecoration.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-12-10 09:14:26 +00:00
Messages.sh