l10n daemon script aa0f2c88f0 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-01-10 11:46:53 +00:00
..
declarative-plugin	[kcmkwin/deco] Delay deleting of PreviewBridge	2015-10-20 14:33:15 +02:00
qml	Merge branch 'Plasma/5.4'	2015-10-21 08:11:38 +02:00
CMakeLists.txt
decorationmodel.cpp
decorationmodel.h
kcm.cpp	overhaul of deco kcm	2015-10-05 23:40:46 +02:00
kcm.h
kcm.ui	overhaul of deco kcm	2015-10-05 23:40:46 +02:00
kwindecoration.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-01-10 11:46:53 +00:00
Messages.sh