l10n daemon script 3433b05c97 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-11-04 17:27:21 +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	[kcmkwin/deco] Drop outdated source and ui files	2014-12-09 16:14:03 +01:00
decorationmodel.cpp	[kcmkwin/deco] Add configuration for decoration plugin/themes	2014-12-05 13:44:16 +01:00
decorationmodel.h	[kcmkwin/deco] Add configuration for decoration plugin/themes	2014-12-05 13:44:16 +01:00
kcm.cpp	overhaul of deco kcm	2015-10-05 23:40:46 +02:00
kcm.h	use xembed for the qml view of window decorations modul	2015-01-28 09:58:47 +01:00
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	2015-11-04 17:27:21 +00:00
Messages.sh	extract the strings also from QML	2014-12-16 21:02:27 +01:00