diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-05 07:22:27 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-05 07:22:27 (GMT) |
commit | 349e9189e205c3dfdef271798310d1f38163b891 (patch) | |
tree | 1a0369fe07e61e21b8f42f177bcb46cdcac272e4 /tests | |
parent | 7474ad656269aec1352d166bb5a4435086d48482 (diff) | |
parent | 622446fdd8b6ac14287b65fc640e07819e136a3c (diff) | |
download | Qt-349e9189e205c3dfdef271798310d1f38163b891.zip Qt-349e9189e205c3dfdef271798310d1f38163b891.tar.gz Qt-349e9189e205c3dfdef271798310d1f38163b891.tar.bz2 |
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
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions