l10n daemon script c342be5961 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-10-03 11:20:49 +00:00
..
lib	Change default logging category to QtCriticalMsg	2015-07-31 13:29:58 +02:00
qml	Fix title height for maximized windows with Aurorae decorator	2015-03-23 23:27:09 +10:00
aurorae.cpp	Clean debug output	2015-07-20 13:36:27 +02: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	[kwin] Add ProvidersUrl to *.knsrc	2014-02-03 13:04:12 +01:00
CMakeLists.txt	[aurorae] Port loading of QML decos to KPackage	2015-07-07 09:53:48 +02:00
colorhelper.cpp	Remove KDE/ prefix in include directories	2014-03-17 16:24:10 +01:00
colorhelper.h	Replace NULL with nullptr in clients folder	2014-02-24 17:02:11 +01:00
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	[aurorae] Change QML for themes to QtQuick 2	2013-10-01 14:05:50 +02:00
decorationplugin.h	[aurorae] Change QML for themes to QtQuick 2	2013-10-01 14:05:50 +02:00
kwindecoration.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-10-03 11:20:49 +00:00