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 13:20:45 +0000 (23:20 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 11 May 2011 13:20:45 +0000 (23:20 +1000)
commit83aa91f550c28f33bacfc132ad514e29732b60f4
treeecc6c33cc3adf965f526110c839ce3e07f1237ed
parent3f8923d3a5d90220f376ac5946e32df2629f87f9
parentdf4d7f18111420d05276312627c64c82c334e2a6
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Fix GLES2 include path for applications when not using the dash shell