diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-06 07:44:41 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-06 07:44:41 (GMT) |
| commit | 4697a2b50df7135e1da0917676652bcc12abab2a (patch) | |
| tree | a7788f62bcee2a4d8f738aa1f5b39d1355380a6d /examples/multimedia | |
| parent | a0ff96a8fd1cbf1206afd12e0062949fa035f64f (diff) | |
| parent | d1ab59da5de38ce0df0e6b9961fc5bf6580e5607 (diff) | |
| download | Qt-4697a2b50df7135e1da0917676652bcc12abab2a.zip Qt-4697a2b50df7135e1da0917676652bcc12abab2a.tar.gz Qt-4697a2b50df7135e1da0917676652bcc12abab2a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
src/declarative/graphicsitems/qdeclarativepainteditem.cpp
Diffstat (limited to 'examples/multimedia')
0 files changed, 0 insertions, 0 deletions