Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
authorRhys Weatherley <rhys.weatherley@nokia.com>
Wed, 9 Sep 2009 06:28:13 +0000 (16:28 +1000)
committerRhys Weatherley <rhys.weatherley@nokia.com>
Wed, 9 Sep 2009 06:28:13 +0000 (16:28 +1000)
commitb285f22389843925493be102b440dbd06c533878
treef0f1e0f6cbd97b17ffa237f013fcc77f1af5758c
parent6eb6920d134ee6a0cc0f27d63d65003a3d9c1fee
parent08a6e65ce3b5cf45d10dd951606c6cb44b753daf
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
src/opengl/qgl.cpp
src/opengl/qgl.h
src/opengl/qgl_p.h
src/opengl/qglshaderprogram.cpp