l10n daemon script c240755dee 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 23:41:42 +00:00
..
declarative-plugin	Testing whether m_lastCreatedSettings is not null before calling its method	2016-04-08 09:26:48 +02:00
qml
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
kcm.ui
kwindecoration.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-06-23 23:41:42 +00:00
Messages.sh