diff options
author | Bea Lam <bea.lam@nokia.com> | 2010-03-03 22:59:44 (GMT) |
---|---|---|
committer | Bea Lam <bea.lam@nokia.com> | 2010-03-03 22:59:44 (GMT) |
commit | 5ac068602871b78eb4b58634d58e6b8898acbf8d (patch) | |
tree | 0bbbf13392abbb723e4e496a8c0a640e99ef726a /tests/auto/qmediaplayer | |
parent | 89e29d1f7a61f5cfa15cbce9b225a9d9ee9b4b7f (diff) | |
parent | 1a7df5ef1fc81fbf2d548c40e3feeb8ef3bb5a8c (diff) | |
download | Qt-5ac068602871b78eb4b58634d58e6b8898acbf8d.zip Qt-5ac068602871b78eb4b58634d58e6b8898acbf8d.tar.gz Qt-5ac068602871b78eb4b58634d58e6b8898acbf8d.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto/qmediaplayer')
0 files changed, 0 insertions, 0 deletions