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)
commiteb5ad10b2cc954919e224f3c18c05898b52e0403
tree520f34272c41bc7afd6566b67e2c1e9c7f88ea29
parentd4a50774469e92a7c55bf0b184fe8e9e29d2c1cf
parent7fce0a73cc9b099c4ca67b3bc2e8bbe3060230c6
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Check if OES_texture_npot is present on OpenGL ES 2.