OSDN Git Service

Merge remote branch 'origin/2.1'
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Mon, 15 Nov 2010 18:03:18 +0000 (19:03 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Mon, 15 Nov 2010 18:03:18 +0000 (19:03 +0100)
commit04d4d309f707a9512655dd04080045248f69e4a2
tree9603e1de3168c847923cf13dee20d7441d354fd3
parent146b2f05618bb5b683166762fcdf9d56bd46b2d7
parenta783a90f4de6079cfc9286790a03130206b7f5ed
Merge remote branch 'origin/2.1'

Conflicts:
    share/qtcreator/static.pro
    src/plugins/qmljseditor/qmljsoutlinetreeview.cpp
    src/plugins/projectexplorer/outputwindow.cpp
doc/qtcreator.qdoc
src/libs/utils/annotateditemdelegate.cpp
src/plugins/projectexplorer/outputwindow.cpp
src/plugins/qmljseditor/quicktoolbar.cpp
src/plugins/qt4projectmanager/qtoptionspage.cpp
src/plugins/qt4projectmanager/qtversionmanager.cpp
src/plugins/qt4projectmanager/qtversionmanager.h