Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 5 May 2011 18:21:17 +0000 (04:21 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 5 May 2011 18:21:17 +0000 (04:21 +1000)
commitbedc018370bd754c5d97f9a60d8f98d50495a3cd
treef6e9fc0e49c100a4978bac0f96bccbca50345d0e
parent8663200eb0e13b05d7c1c23dc9b955f0050fa798
parent1edc4510572b6a10f2b6ee16697204cd95114fda
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Dont do doneCurrent in swapBuffers