Martin Gräßlin c2e53b9a2f Merge branch 'kdecorations2' ... Conflicts: effects.cpp paintredirector.cpp		2014-12-02 08:38:10 +01:00
..
declarative-plugin
qml
auroraeconfig.ui
buttons.cpp
buttons.h
buttons.ui
buttonsconfigdialog.cpp
buttonsconfigdialog.h
CMakeLists.txt
config.ui
configdialog.cpp
configdialog.h
decoration.ui
decorationmodel.cpp
decorationmodel.h
kcm.cpp
kcm.h
kwindecoration.desktop
Messages.sh
pixmaps.h