Commit 349e9189e205c3dfdef271798310d1f38163b891

  • avatar
  • Qt Continuous Integration System <qt-info @no…a.com>
  • Fri Feb 05 08:22:27 CET 2010
  • Tree SHA1: 1a0369f
  • Parent SHA1: 7474ad6 (Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration)
  • Parent SHA1: 622446f (Add QMacCompatGLenum overrides for new QGLShaderProgram functions) 
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Add QMacCompatGLenum overrides for new QGLShaderProgram functions