OSDN Git Service

Merge branch '2.0'
authorChristian Kamm <christian.d.kamm@nokia.com>
Wed, 28 Jul 2010 12:20:44 +0000 (14:20 +0200)
committerChristian Kamm <christian.d.kamm@nokia.com>
Wed, 28 Jul 2010 12:20:44 +0000 (14:20 +0200)
commite03a6b6ea254610ea5593413a23e5477241ec766
tree6bf7ce7f372c4e28bc62636677f035f7e8b2d231
parent06afc4f85cf9cdeaf27324c0e761fea2f59a4e80
parentdf87d970bc9ada725a4f7e03dd7c9065cdb1fd35
Merge branch '2.0'

Conflicts:
share/qtcreator/qml-type-descriptions/qml-builtin-types.xml
src/plugins/debugger/stackhandler.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
share/qtcreator/qml-type-descriptions/qml-builtin-types.xml
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp