l10n daemon script 13d389efd1 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"		2016-12-20 13:30:44 +01:00
..
declarative-plugin
qml	Align configure button consistently across delegates	2016-11-28 09:24:55 +00:00
CMakeLists.txt
decorationmodel.cpp
decorationmodel.h
kcm.cpp
kcm.h
kcm.ui
kwindecoration.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-20 13:30:44 +01:00
Messages.sh