summaryrefslogtreecommitdiffstats
path: root/src/opengl/qgl_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-12 12:07:46 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-12 12:07:46 (GMT)
commitac19a3409253f5f74984624b99268212ba74c086 (patch)
treeb9526dbe83204953056cec33579bcab9fbca060a /src/opengl/qgl_p.h
parent7e7370acb32df2cf3f24d4d3bff8e72cbe662e16 (diff)
parent354246566cf86f687ee897f95586ac17b5deb35c (diff)
downloadQt-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