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>
Fri, 27 Aug 2010 05:53:51 +0000 (07:53 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 27 Aug 2010 05:53:51 +0000 (07:53 +0200)
commit46194955b223b65b08c300325d6de0620817aa04
treedd974c2c48ad0e69a13d3f60caa213510e32e72f
parente5aa5a9d7e97b975316b8cc18554743cccf06474
parent1744a94ce6a75ead5bb92546f1e0b28dd8a8a05c
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:
  Recognize GL_ARB_shader_objects as indicating shaders