kwin/plugins/kdecorations/aurorae/src
l10n daemon script 3fcb19f42f 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 06:22:20 +01:00
..
lib
qml
aurorae.cpp
aurorae.h
aurorae.json
aurorae.knsrc SVN_SILENT made messages (.desktop file) - always resolve ours 2017-02-23 06:22:20 +01:00
CMakeLists.txt
colorhelper.cpp
colorhelper.h
decorationoptions.cpp
decorationoptions.h
decorationplugin.cpp
decorationplugin.h
kwindecoration.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2016-09-24 09:51:29 +00:00