diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-16 03:55:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-16 03:55:56 (GMT) |
| commit | ba910144d405977eb78ee86647ec68d7aef46f6b (patch) | |
| tree | 4c9146614a7d8fc2231d5e35f7fde36f81500a71 /demos | |
| parent | 17fbbdd3a081a66e1d2b26db7935111c49cea75e (diff) | |
| parent | 11e4f7f57879b4615b8ce31f6539d30433f7a506 (diff) | |
| download | Qt-ba910144d405977eb78ee86647ec68d7aef46f6b.zip Qt-ba910144d405977eb78ee86647ec68d7aef46f6b.tar.gz Qt-ba910144d405977eb78ee86647ec68d7aef46f6b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Attribute change to allow inclusion of image files.
Diffstat (limited to 'demos')
0 files changed, 0 insertions, 0 deletions