Merge branch 'master' of git:qt/qt-multimedia-staging
authorThiago Macieira <thiago.macieira@nokia.com>
Thu, 22 Apr 2010 07:48:44 +0000 (09:48 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Thu, 22 Apr 2010 07:48:44 +0000 (09:48 +0200)
commit55b5df7277c55ad97e83dc9da0ff14760f447f2d
tree651ced89e2d4f1d568849ba2dbfa040f416bedea
parenta7fa1c6b5de21cbfeb3c6637b3d0bca9ca9d00ba
parent82ddb3a39596b6c245d26c80c1e3935aba04a3a9
Merge branch 'master' of git:qt/qt-multimedia-staging

Conflicts:
src/multimedia/qml/qsoundeffect_qsound_p.cpp
tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir