diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-02-24 23:49:10 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-02-24 23:49:10 (GMT) |
| commit | 0bef5b3a51bf47851caf29bf0dedbf26a56cb8c4 (patch) | |
| tree | f1c8379b25df379fda62cd3069df8e70b3ff86d7 /src/plugins/qdeclarativemodules/multimedia/multimedia.cpp | |
| parent | f39bb2af2d81640d30222cd5abc31b076105dd8b (diff) | |
| parent | ef30a6f336d55c813423bf139d8363f50181179f (diff) | |
| download | Qt-0bef5b3a51bf47851caf29bf0dedbf26a56cb8c4.zip Qt-0bef5b3a51bf47851caf29bf0dedbf26a56cb8c4.tar.gz Qt-0bef5b3a51bf47851caf29bf0dedbf26a56cb8c4.tar.bz2 | |
Merge branch 'master' of ../../qt/master
Conflicts:
src/multimedia/qml/qml.pri
src/multimedia/qml/qmlaudio_p.h
src/multimedia/qml/qmlgraphicsvideo_p.h
src/multimedia/qml/qmlmediabase_p.h
src/plugins/qmlmodules/multimedia/multimedia.cpp
Diffstat (limited to 'src/plugins/qdeclarativemodules/multimedia/multimedia.cpp')
0 files changed, 0 insertions, 0 deletions