summaryrefslogtreecommitdiffstats
path: root/examples/opengl/cube/geometryengine.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-05-19 22:53:06 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-05-19 22:53:06 +1000
commita813d7c24a367b59869c588fb728ab24f75daa82 (patch)
tree17eea2598afa3759db2342a9032057b629dd9110 /examples/opengl/cube/geometryengine.cpp
parentc1031d334f6ecac42a3cb57ea326a1a8cfa7fa1e (diff)
parenta98ebc599ab7c99a6431d0420d3f0d238f37f6b1 (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: Wayland: send surface id + process id pairs to compositor
Diffstat (limited to 'examples/opengl/cube/geometryengine.cpp')
0 files changed, 0 insertions, 0 deletions