l10n daemon script b1aa4e84ef 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-10-16 05:07:40 +02:00
..
declarative-plugin
qml	Fix KWin decoration KCM showing correct index at startup	2017-04-13 11:54:39 +01:00
CMakeLists.txt
decorationmodel.cpp
decorationmodel.h
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
kwindecoration.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-10-16 05:07:40 +02:00
Messages.sh