Merge branch '4.5' into 4.6-staging
authorThiago Macieira <thiago.macieira@nokia.com>
Tue, 8 Dec 2009 19:30:36 +0000 (20:30 +0100)
committerThiago Macieira <thiago.macieira@nokia.com>
Tue, 8 Dec 2009 19:30:36 +0000 (20:30 +0100)
commit596eed45c626ea2652e1f9495a0946d32eb4c6da
tree5b6ad81d3f837729fc37c3592fa20fdedc26a237
parentf3c37838ab149a8a570b7f1df987705815ae45c0
parent0b78ccc201f58b53c90e6327b051bfdb8c08ee14
Merge branch '4.5' into 4.6-staging
src/opengl/qgl.cpp
src/opengl/qpaintengine_opengl.cpp