Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 11 May 2011 10:41:00 +0000 (20:41 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 11 May 2011 10:41:00 +0000 (20:41 +1000)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Check if OES_texture_npot is present on OpenGL ES 2.


Trivial merge