Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 16 Aug 2010 07:46:08 +0000 (09:46 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 16 Aug 2010 07:46:08 +0000 (09:46 +0200)
commit35abe608440f2effd330fd213955e391c4a412a2
tree675f2da4f2d4d3c05afdec42183d3c76b53c0523
parent550ac75e1639362010e8c24010a8b541a83d8512
parent0a94e2af3c29afa6e8d7ae3041bed4f187b3c1ca
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix OpenGLVersionFlags on OpenGL 4.0 systems