kwin/clients/aurorae/src
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"
2015-11-07 21:21:42 +00:00
..
lib optimize string operations 2015-11-05 14:14:06 +00:00
qml [aurorae] Use property binding for toggled state 2015-11-02 10:11:32 +01:00
aurorae.cpp optimize string operations 2015-11-05 14:14:06 +00:00
aurorae.h Require Qt 5.4 2015-02-19 10:56:50 +01:00
aurorae.json SVN_SILENT made messages (.desktop file) - always resolve ours 2015-07-07 13:43:56 +00:00
aurorae.knsrc
CMakeLists.txt [aurorae] Port loading of QML decos to KPackage 2015-07-07 09:53:48 +02:00
colorhelper.cpp
colorhelper.h
decorationoptions.cpp [aurorae] Use mousePressAndHoldInterval from StyleHints 2014-12-16 08:27:11 +01:00
decorationoptions.h [aurorae] Use mousePressAndHoldInterval from StyleHints 2014-12-16 08:27:11 +01:00
decorationplugin.cpp
decorationplugin.h
kwindecoration.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-07 21:21:42 +00:00