Merge branch 'master' of git://anongit.kde.org/kde-workspace
author Anne-Marie Mahfouf
()
committer Anne-Marie Mahfouf
()
commit 6b32ed83ef46823955a9669a5eb64c966c4c2281
tree 128974138773015dad48f74c18e2041218da9a6d
parent af287badaf831bc42b1c33265a44d5b843a80f7f
parent c6cdcf5705303dd56751dd39e2cdf59e185d6380
Merge branch 'master' of git://anongit.kde.org/kde-workspace
23 files changed:
CMakeLists.txt
kwin/clients/oxygen/oxygenclient.cpp
kwin/clients/oxygen/oxygenconfiguration.cpp
kwin/clients/oxygen/oxygenconfiguration.h
kwin/kcmkwin/kwindecoration/CMakeLists.txt
kwin/kcmkwin/kwindecoration/decoration.ui
kwin/kcmkwin/kwindecoration/decorationmodel.cpp
kwin/kcmkwin/kwindecoration/decorationmodel.h
kwin/kcmkwin/kwindecoration/kwindecoration.cpp
kwin/kcmkwin/kwindecoration/kwindecoration.h
kwin/kcmkwin/kwindecoration/qml/OxygenScrollbar.qml [ deleted file ]
kwin/kcmkwin/kwindecoration/qml/images/arrowup.png [ deleted file ]
kwin/kcmkwin/kwindecoration/qml/images/arrowupactive.png [ deleted file ]
kwin/kcmkwin/kwindecoration/qml/images/bg.png [ deleted file ]
kwin/kcmkwin/kwindecoration/qml/images/glow.png [ deleted file ]
kwin/kcmkwin/kwindecoration/qml/images/scrool.png [ deleted file ]
kwin/kcmkwin/kwindecoration/qml/images/scroolactive.png [ deleted file ]
kwin/kcmkwin/kwindecoration/qml/images/shadow.png [ deleted file ]
kwin/kcmkwin/kwindecoration/qml/main.qml
kwin/scripting/scriptedeffect.cpp
plasma/generic/applets/batterymonitor/contents/ui/PopupDialog.qml
plasma/generic/applets/batterymonitor/contents/ui/batterymonitor.qml
plasma/generic/applets/batterymonitor/metadata.desktop