kwin/plugins/kdecorations/aurorae/src
l10n daemon script 30b516eceb 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"
2020-09-30 06:16:48 +02:00
..
lib Replace remaining usages of old connect syntax with new connect syntax 2020-09-24 09:33:45 +00:00
qml
aurorae.cpp
aurorae.h
aurorae.json
aurorae.knsrc SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-30 06:16:48 +02: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 2020-09-26 05:57:20 +02:00