summaryrefslogtreecommitdiffstats
path: root/examples/opengl/cube/geometryengine.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-05-20 12:18:56 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-05-20 12:18:56 +1000
commit240e35ddeb6a71c99bcef53eccee206b02d72d85 (patch)
tree3d765109a5ec53cac23f011677debec178b60005 /examples/opengl/cube/geometryengine.cpp
parentff08e8c009323eadd3df79100979cbb937d8e1e3 (diff)
parent66498850f2d5cf3a41579323c5119a7b6c9ce830 (diff)
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Allow arthur tests to use private headers.
Diffstat (limited to 'examples/opengl/cube/geometryengine.cpp')
0 files changed, 0 insertions, 0 deletions