Merge branch 'master' into refactor
authorLaszlo Agocs <laszlo.p.agocs@nokia.com>
Wed, 27 Jul 2011 09:34:09 +0000 (12:34 +0300)
committerLaszlo Agocs <laszlo.p.agocs@nokia.com>
Wed, 27 Jul 2011 09:34:09 +0000 (12:34 +0300)
commit122d2550fe44ac6f1ae7099bb2eef2489c63a92b
treed73c29b713e9c77132475cd62e090812592f13c6
parent76b9f821d517dbd4a784a5b35de30b8d35c316c0
parent509dbb646b9d2906084ecfadfcb997341506767d
Merge branch 'master' into refactor

Conflicts:
examples/qml-compositor/qml-compositor.pro
examples/qwidget-compositor-mdi/qt-compositor.pro
src/qt-compositor/hardware_integration/hardware_integration.pri
src/qt-compositor/wayland_wrapper/wlsurface.cpp