summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-16 13:22:26 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-16 13:22:26 (GMT)
commit65b05e330640a5e1920c61a4735cbc27a5ca3fe2 (patch)
tree221f49ffdbdd6f2644c7f8f1ddf4a7e25a8a51d6 /demos
parentc9a89b253176547901e11d27c042983a65f43b1f (diff)
parentba910144d405977eb78ee86647ec68d7aef46f6b (diff)
downloadQt-65b05e330640a5e1920c61a4735cbc27a5ca3fe2.zip
Qt-65b05e330640a5e1920c61a4735cbc27a5ca3fe2.tar.gz
Qt-65b05e330640a5e1920c61a4735cbc27a5ca3fe2.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