Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into...
authorBea Lam <bea.lam@nokia.com>
Wed, 23 Sep 2009 01:44:14 +0000 (11:44 +1000)
committerBea Lam <bea.lam@nokia.com>
Wed, 23 Sep 2009 01:44:14 +0000 (11:44 +1000)
commitb9f7d5ebad998da0863e7f57cc1e5f1d3b6e673b
treea1fc6a13d896327a44390c00c89ba8c4ad205234
parentc60dfe1f2732670eb48d98c9772815d37a16ec3c
parent1dfabbbb1b740060444a11cd894561aed3a884ad
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

Conflicts:
src/declarative/qml/qml.pri
src/declarative/qml/qml.pri
src/declarative/qml/qmlenginedebug.cpp
tools/qmldebugger/engine.cpp
tools/qmldebugger/engine.h