OSDN Git Service

Merge remote branch 'origin/2.0'
authorcon <qtc-committer@nokia.com>
Tue, 6 Jul 2010 13:34:50 +0000 (15:34 +0200)
committercon <qtc-committer@nokia.com>
Tue, 6 Jul 2010 13:34:50 +0000 (15:34 +0200)
commit1a2a4f6387e890d6564eac5644bb26bfe6985d2c
tree1bbbc92c4f458ca878489d2e84cbc6fa8839b504
parent7feed7318b3ca52d56cb6eb8f11233f32bdcae09
parent15047f8816716af0794da4164daa3e007175a78a
Merge remote branch 'origin/2.0'

Conflicts:
share/qtcreator/gdbmacros/dumper.py
src/libs/qmljs/qmljs-lib.pri
src/plugins/fakevim/fakevimhandler.cpp
share/qtcreator/gdbmacros/dumper.py
src/libs/qmljs/qmljs-lib.pri
src/plugins/bineditor/bineditor.cpp
src/plugins/projectexplorer/outputwindow.cpp
src/plugins/qmldesigner/designersettings.cpp
src/plugins/qmldesigner/qmldesignerplugin.cpp
src/plugins/qmldesigner/qmldesignerplugin.pro
src/plugins/qt4projectmanager/qt4nodes.cpp