summaryrefslogtreecommitdiffstats
path: root/examples/opengl/framebufferobject2/cubelogo.png
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-09 17:23:57 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-09 17:23:57 (GMT)
commit4809920df3c3329d47f595c1287ab44b454abb88 (patch)
treeaffbce24e8018cdf82857ca2368f0d132bd4a20c /examples/opengl/framebufferobject2/cubelogo.png
parent6a786ab4bb4a5e1d80ce511461f2018237f1614a (diff)
parentf0c1f381af7d6338ded9f65d00ed54b1b9405ba9 (diff)
downloadQt-4809920df3c3329d47f595c1287ab44b454abb88.zip
Qt-4809920df3c3329d47f595c1287ab44b454abb88.tar.gz
Qt-4809920df3c3329d47f595c1287ab44b454abb88.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add missing data for the autotest of in-place conversion for Pixmap Avoid in-place convertion of images with multiple references Fix infinite loop when justifying undisplayable Arabic text
Diffstat (limited to 'examples/opengl/framebufferobject2/cubelogo.png')
0 files changed, 0 insertions, 0 deletions