Merge branch 'master' of ../qt-qml-staging
authorMichael Brasser <michael.brasser@nokia.com>
Thu, 14 Apr 2011 04:47:16 +0000 (14:47 +1000)
committerMichael Brasser <michael.brasser@nokia.com>
Thu, 14 Apr 2011 04:47:16 +0000 (14:47 +1000)
commitcc3bcc003048760a501debe49b6fcebffaac3cef
tree5d8d8e5ea0cd1c9dffc6abd3e6e40058536236c8
parenta5d5971586d0a12e55374dae30e17454bca12600
parent662174b78b7e08c759d0086e215e81e9e0eaf0c5
Merge branch 'master' of ../qt-qml-staging
tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
tools/qml/main.cpp