diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-01 07:27:08 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-01 07:27:08 (GMT) |
commit | f3da2f414f9fce9aa014da79be9f50c075c60936 (patch) | |
tree | bcf78f1d5a39e9dd07b5de54dd712ab00af74b72 /src/opengl/qgl.cpp | |
parent | 424fb9610473c15adfa5dd38606be032ebacd536 (diff) | |
parent | 6e8f18941ccbb1eb465c776f4b1f5f65f038748d (diff) | |
download | Qt-f3da2f414f9fce9aa014da79be9f50c075c60936.zip Qt-f3da2f414f9fce9aa014da79be9f50c075c60936.tar.gz Qt-f3da2f414f9fce9aa014da79be9f50c075c60936.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Assistant: Fix unintended tr context change.
Diffstat (limited to 'src/opengl/qgl.cpp')
0 files changed, 0 insertions, 0 deletions