Merge branch 'master' of git:qt/qt-qml
authorThiago Macieira <thiago.macieira@nokia.com>
Thu, 22 Apr 2010 07:59:22 +0000 (09:59 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Thu, 22 Apr 2010 07:59:22 +0000 (09:59 +0200)
commit6e6c1de189bd50af2de721ee6c93b13bf0ca2a9e
tree651ced89e2d4f1d568849ba2dbfa040f416bedea
parenta7fa1c6b5de21cbfeb3c6637b3d0bca9ca9d00ba
parent752550cec220cf42c77ee932a581d88e104fc256
Merge branch 'master' of git:qt/qt-qml

Conflicts:
tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir