l10n daemon script ba0b34c755 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-11-22 06:02:11 +01:00
..
declarative-plugin
qml
CMakeLists.txt
decorationmodel.cpp
decorationmodel.h
kcm.cpp
kcm.h
kcm.ui	[KCMs] move GHNS buttons to the normal location	2018-10-31 07:29:22 -06:00
kwindecoration.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-22 06:02:11 +01:00
Messages.sh