OSDN Git Service

Merge remote branch 'origin/2.0'
authorcon <qtc-committer@nokia.com>
Mon, 26 Jul 2010 10:37:57 +0000 (12:37 +0200)
committercon <qtc-committer@nokia.com>
Mon, 26 Jul 2010 10:37:57 +0000 (12:37 +0200)
commit001e759b2a832ffe1045d160211e89b9fd4a8fa0
treebaa54dcaa12a0564afb707b9f9c14ff156cd8235
parent05ed39bb81cbfa777956f248681a3c65b564b1b0
parented0394d452892abf89e93963d4fa22caa5793d55
Merge remote branch 'origin/2.0'

Conflicts:
src/plugins/debugger/cdb/cdbdebugengine.cpp
src/plugins/debugger/cdb/cdbdumperhelper.cpp
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/debugger/cdb/cdbdumperhelper.h
src/plugins/debugger/cdb/cdboptions.cpp
src/plugins/debugger/cdb/cdboptions.h
src/plugins/debugger/cdb/cdboptionspage.cpp
src/plugins/projectexplorer/projectexplorer.cpp