OSDN Git Service

Merge remote-tracking branch 'origin/2.2'
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Wed, 23 Mar 2011 13:42:31 +0000 (14:42 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Wed, 23 Mar 2011 13:42:31 +0000 (14:42 +0100)
commit4e2937bf486bfc455722ba064ca877dbb3e4fe09
tree881e4ecdbf40e6fae413b39205e515d47617f838
parentf67e9a54c99b134e86068f7c385ea79fbeeb121b
parentb756d30c2173a4c20454622937c39dd3b7652cdf
Merge remote-tracking branch 'origin/2.2'

Conflicts:
src/plugins/debugger/debuggersourcepathmappingwidget.cpp
src/plugins/debugger/debuggerengine.cpp
src/plugins/qt4projectmanager/qt4target.cpp