l10n daemon script bb4005ec50 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"		2017-02-23 08:18:46 +01:00
..
declarative-plugin	Restore global menu support	2017-01-11 10:21:03 +01:00
qml	Avoid a crash on Kwin decoration KCM teardown	2017-02-10 10:52:48 +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	Avoid a crash on Kwin decoration KCM teardown	2017-02-10 10:52:48 +01:00
kcm.h	Avoid a crash on Kwin decoration KCM teardown	2017-02-10 10:52:48 +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	2017-02-23 08:18:46 +01:00
Messages.sh	extract the strings also from QML	2014-12-16 21:02:27 +01:00