You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
l10n daemon script 56860e63f5 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"
9 years ago
..
lib
qml
CMakeLists.txt
aurorae.cpp
aurorae.h
aurorae.json
aurorae.knsrc
colorhelper.cpp
colorhelper.h
decorationoptions.cpp
decorationoptions.h
decorationplugin.cpp
decorationplugin.h
kwindecoration.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago