Merge branch 'gl2engine-new-shaders' into graphics-master
authorTom Cooksey <thomas.cooksey@nokia.com>
Wed, 6 May 2009 11:05:02 +0000 (13:05 +0200)
committerTom Cooksey <thomas.cooksey@nokia.com>
Wed, 6 May 2009 11:05:02 +0000 (13:05 +0200)
commit6395cd6d6ccbf0c15f77ef3061a0bac7189c575b
tree1322b249c2c935394a491c4dbfe531e6b97ab580
parentae3c71bcc588f4b11158cb943c7dd453f066efc6
parent7d6281973f8b0a5b53e63952f0d03624e6020454
Merge branch 'gl2engine-new-shaders' into graphics-master

Conflicts:
src/gui/painting/qpaintengine_raster.cpp
src/gui/painting/qpaintengine_raster.cpp
src/opengl/qglframebufferobject.cpp