diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-08 02:15:01 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-08 02:15:01 (GMT) |
commit | 22c01928872db30bd47c740abd714989ac910b95 (patch) | |
tree | fff07026cfbfed1461be3ad43749c5c7624059c4 /src/opengl/qgl.h | |
parent | 983bfa4a069b8bf51913be461c6a79c71fa18792 (diff) | |
parent | 465d2c6356bdfd70bd28c6ec53191e73682b06c1 (diff) | |
download | Qt-22c01928872db30bd47c740abd714989ac910b95.zip Qt-22c01928872db30bd47c740abd714989ac910b95.tar.gz Qt-22c01928872db30bd47c740abd714989ac910b95.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Task-number: QTBUG-15059
Diffstat (limited to 'src/opengl/qgl.h')
0 files changed, 0 insertions, 0 deletions