diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-05-13 05:26:53 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-05-13 05:26:53 (GMT) |
| commit | b31d5914f166e0a8c67b05ff80a6a221f48c1945 (patch) | |
| tree | 76fc491ee8be1fad680fc1a0b313dd2d22308794 /demos/qmediaplayer/mediaplayer.h | |
| parent | 58ed26c320fba396c71a809ed61853683ebe696a (diff) | |
| parent | 5220b879a19b4fa1e28829e724c1ad12e85566f4 (diff) | |
| download | Qt-b31d5914f166e0a8c67b05ff80a6a221f48c1945.zip Qt-b31d5914f166e0a8c67b05ff80a6a221f48c1945.tar.gz Qt-b31d5914f166e0a8c67b05ff80a6a221f48c1945.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'demos/qmediaplayer/mediaplayer.h')
0 files changed, 0 insertions, 0 deletions