diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-12 12:07:46 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-12 12:07:46 (GMT) |
commit | ac19a3409253f5f74984624b99268212ba74c086 (patch) | |
tree | b9526dbe83204953056cec33579bcab9fbca060a /src/opengl/qgl_p.h | |
parent | 7e7370acb32df2cf3f24d4d3bff8e72cbe662e16 (diff) | |
parent | 354246566cf86f687ee897f95586ac17b5deb35c (diff) | |
download | Qt-ac19a3409253f5f74984624b99268212ba74c086.zip Qt-ac19a3409253f5f74984624b99268212ba74c086.tar.gz Qt-ac19a3409253f5f74984624b99268212ba74c086.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:
Fix text position with OpenGL engine and Freetype
Diffstat (limited to 'src/opengl/qgl_p.h')
0 files changed, 0 insertions, 0 deletions