l10n daemon script 99237c9b3f 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-06-01 10:08:03 +00:00
..
declarative-plugin	Adapt to KDecoration API changes	2015-03-31 15:26:55 +02:00
qml
CMakeLists.txt
decorationmodel.cpp
decorationmodel.h
kcm.cpp
kcm.h
kcm.ui
kwindecoration.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-06-01 10:08:03 +00:00
Messages.sh