l10n daemon script 99237c9b3f 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-06-01 10:08:03 +00:00
..
lib	[aurorae] Fix BorderSize for SVG based themes	2014-12-05 17:36:25 +01:00
qml	Fix title height for maximized windows with Aurorae decorator	2015-03-23 23:27:09 +10:00
aurorae.cpp	Require Qt 5.4	2015-02-19 10:56:50 +01:00
aurorae.h	Require Qt 5.4	2015-02-19 10:56:50 +01:00
aurorae.json	[kcmkwin/deco] Bring back KNewStuff support	2014-12-05 10:15:41 +01:00
aurorae.knsrc	[kwin] Add ProvidersUrl to *.knsrc	2014-02-03 13:04:12 +01:00
CMakeLists.txt	[kcmkwin/deco] Add configuration for decoration plugin/themes	2014-12-05 13:44:16 +01: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
decorationplugin.h
kwindecoration.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-06-01 10:08:03 +00:00