Thomas Lübking 9bf14c2653 Merge branch 'KDE/4.11' ... Conflicts: kwin/clients/aurorae/src/aurorae.cpp		2013-10-20 19:40:48 +02:00
..
qml
auroraeconfig.ui
buttons.cpp
buttons.h
buttons.ui
buttonsconfigdialog.cpp
buttonsconfigdialog.h
CMakeLists.txt
config.ui
configdialog.cpp	Merge branch 'KDE/4.11'	2013-10-20 19:40:48 +02:00
configdialog.h	Merge branch 'KDE/4.11'	2013-10-20 19:40:48 +02:00
decoration.ui
decorationmodel.cpp
decorationmodel.h
kwindecoration.cpp	Merge branch 'KDE/4.11'	2013-10-20 19:40:48 +02:00
kwindecoration.desktop
kwindecoration.h
Messages.sh
pixmaps.h
preview.cpp
preview.h