l10n daemon script d8addb6b3a 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"		2018-06-18 07:25:30 +02:00
..
declarative-plugin	KWin: tooltips	2018-01-18 19:59:17 +01:00
qml	Clean up kwindecoration KCM qml code	2018-04-18 10:57:30 +01: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	Sort the themes in decoration KCM	2017-04-13 11:54:44 +01:00
kcm.h	Fix KWin decoration KCM showing correct index at startup	2017-04-13 11:54:39 +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	2018-06-18 07:25:30 +02:00
Messages.sh	extract the strings also from QML	2014-12-16 21:02:27 +01:00