Oswald Buddenhagen 65c0eb5165 Merge branch '2.3' ...

Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp

Change-Id: I46509f0c187b71bbaed7b2118a160914f8250ca4

2011-07-29 17:57:59 +02:00

..

qmldump

qmldump: Fix creation of objects from QDeclarativeTypes.

2011-07-14 10:47:33 +02:00

qmljsdebugger

QmlJSLib: Fix linker errors with gcce

2011-07-25 16:42:17 +02:00

qmlobserver

Replace qt-info@nokia.com with info@qt.nokia.com

2011-07-06 11:14:01 +02:00

qmlpuppet

Merge branch '2.3'

2011-07-29 17:57:59 +02:00