Oswald Buddenhagen 1f3896e8af Merge remote-tracking branch 'origin/2.3' ...

Conflicts:
	share/qtcreator/dumper/bridge.py
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/remotelinux/remotelinuxapplicationrunner.cpp

Change-Id: I444f797723d5879ea08c5c0e1f31158d271d4f41

2011-07-07 12:26:59 +02:00

..

qmldump

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

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

qmljsdebugger

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

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

qmlobserver

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

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

qmlpuppet

Merge remote-tracking branch 'origin/2.3'

2011-07-07 12:26:59 +02:00