l10n daemon script 01b61a9ede 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-03-16 10:12:25 +00:00
..
declarative-plugin	Avoid deleting an engine whilst components from our engine are still in use	2015-01-28 14:12:25 +01:00
qml	do not wrap text in deco button drag source	2015-02-05 21:37:33 +01: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-03-16 10:12:25 +00:00
Messages.sh