kwin/plugins/kdecorations/aurorae/src
l10n daemon script 1e4fbcc5ed 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-01-23 05:49:39 +01:00
..
lib Move clients/ to plugins/kdecorations/ 2016-04-15 15:21:03 +02:00
qml Move clients/ to plugins/kdecorations/ 2016-04-15 15:21:03 +02:00
aurorae.cpp Move clients/ to plugins/kdecorations/ 2016-04-15 15:21:03 +02:00
aurorae.h Move clients/ to plugins/kdecorations/ 2016-04-15 15:21:03 +02:00
aurorae.json Move clients/ to plugins/kdecorations/ 2016-04-15 15:21:03 +02:00
aurorae.knsrc SVN_SILENT made messages (.desktop file) - always resolve ours 2017-01-23 05:49:39 +01:00
CMakeLists.txt Move clients/ to plugins/kdecorations/ 2016-04-15 15:21:03 +02:00
colorhelper.cpp Move clients/ to plugins/kdecorations/ 2016-04-15 15:21:03 +02:00
colorhelper.h Move clients/ to plugins/kdecorations/ 2016-04-15 15:21:03 +02:00
decorationoptions.cpp Move clients/ to plugins/kdecorations/ 2016-04-15 15:21:03 +02:00
decorationoptions.h Move clients/ to plugins/kdecorations/ 2016-04-15 15:21:03 +02:00
decorationplugin.cpp Move clients/ to plugins/kdecorations/ 2016-04-15 15:21:03 +02:00
decorationplugin.h Move clients/ to plugins/kdecorations/ 2016-04-15 15:21:03 +02:00
kwindecoration.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2016-09-24 09:51:29 +00:00