diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-20 19:58:45 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-20 19:58:45 (GMT) |
commit | c12af169a157a5ba2e25289b996648a9a8e3cb9f (patch) | |
tree | 0a4352d74c495637a0b137502d3601e918f6a3c1 /demos/spectrum/app/waveform.h | |
parent | dfc61f6b59886f7d223722bf149342cdd46581a8 (diff) | |
parent | 0a2ef85bc7c560f38f5ba591968ce49969893a1c (diff) | |
download | Qt-c12af169a157a5ba2e25289b996648a9a8e3cb9f.zip Qt-c12af169a157a5ba2e25289b996648a9a8e3cb9f.tar.gz Qt-c12af169a157a5ba2e25289b996648a9a8e3cb9f.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Make dynamicscene example embeddeable in another graphics scene
Some minor example fixes
Diffstat (limited to 'demos/spectrum/app/waveform.h')
0 files changed, 0 insertions, 0 deletions