Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
authorGunnar Sletta <gunnar.sletta@nokia.com>
Wed, 30 Jun 2010 13:09:30 +0000 (15:09 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Wed, 30 Jun 2010 13:09:30 +0000 (15:09 +0200)
commit32b1c124b4f90568ce1753fb52617df038bbbf1f
tree7accbc2da4b2bdc419056000d3b93808e8720b17
parent3a2a6e8746b5076b5b7f496444479fa40067731c
parent38a04b3a8c7a33f1636008e04d58690febcc22f5
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
src/opengl/qgl.cpp