OSDN Git Service

Merge remote branch 'origin/1.3'
authorcon <qtc-committer@nokia.com>
Mon, 14 Dec 2009 10:47:39 +0000 (11:47 +0100)
committercon <qtc-committer@nokia.com>
Mon, 14 Dec 2009 10:47:39 +0000 (11:47 +0100)
commit7081a3d415ee9ffdab7815553c1362d079f7e514
tree04038b5d2d08719567e3ae65216a301615af26c1
parentbad8a15f3b858573bc711cb22e4e02d4ae0167e1
parent8f586cedcd3a1bbca31807f502f59297ecf50386
Merge remote branch 'origin/1.3'

Conflicts:
src/plugins/projectexplorer/outputwindow.cpp
doc/qtcreator.qdoc
src/libs/cplusplus/CheckUndefinedSymbols.cpp
src/plugins/projectexplorer/debugginghelper.cpp
src/plugins/projectexplorer/outputwindow.cpp
src/plugins/qt4projectmanager/qtversionmanager.cpp
src/plugins/texteditor/basetexteditor.cpp