Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
authorRhys Weatherley <rhys.weatherley@nokia.com>
Sun, 6 Dec 2009 23:46:15 +0000 (09:46 +1000)
committerRhys Weatherley <rhys.weatherley@nokia.com>
Sun, 6 Dec 2009 23:46:15 +0000 (09:46 +1000)
commit47008b211fe3b972077466e593a2a9016446bab2
treedfb1d9ebd3e3b9e64e5f4e55e5c92fc4e62f54ac
parent7f347a24bc7983d192ab6e545ca33abb515cbba2
parentf34cfa14ff6b0928f98143f72e1f512eceabe27c
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
src/opengl/qgl.cpp
src/opengl/qpaintengine_opengl.cpp