OSDN Git Service

Merge remote branch 'origin/1.3'
authorcon <qtc-committer@nokia.com>
Wed, 6 Jan 2010 15:05:56 +0000 (16:05 +0100)
committercon <qtc-committer@nokia.com>
Wed, 6 Jan 2010 15:05:56 +0000 (16:05 +0100)
commitae6341a9fcf7c621a6dbca1eb72cfa938250cb8e
tree96abaebf6db278cfead3abf291e352e318548aa0
parentf289da3d914ed5361446833eae60773324bcf349
parentea2101950ff00d69124dc9f0b9898aa5724ba371
Merge remote branch 'origin/1.3'

Conflicts:
src/plugins/debugger/debuggeractions.cpp
src/plugins/debugger/debuggerplugin.cpp
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/debugger/watchhandler.cpp