l10n daemon script 8b1a5f27df 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-06-23 21:12:32 +00:00
..
declarative-plugin	Testing whether m_lastCreatedSettings is not null before calling its method	2016-04-08 09:26:48 +02:00
qml	Merge branch 'Plasma/5.4'	2015-10-21 08:11:38 +02:00
CMakeLists.txt
decorationmodel.cpp
decorationmodel.h
kcm.cpp	Add an explicit dependency to Breeze to find decoration plugin	2016-04-12 08:54:50 +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	2016-06-23 21:12:32 +00:00
Messages.sh