OSDN Git Service

Merge branch '2.3' into 2.4
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Tue, 18 Oct 2011 11:50:38 +0000 (13:50 +0200)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Tue, 18 Oct 2011 11:50:38 +0000 (13:50 +0200)
commit0164e1bea219fc82cb1482b6c66683f48cda212d
tree033b82cf1d73ffa162e93326a0e3eb9969e84711
parentaa95055eb06c307f571db035af13a60b5dc293d8
parentdd324e06345ba2901671c00f7a122bd0dccb5f28
Merge branch '2.3' into 2.4

Conflicts:
src/plugins/debugger/commonoptionspage.ui
src/plugins/madde/maemoqtversion.cpp
src/plugins/projectexplorer/runsettingspropertiespage.ui

Change-Id: Ieccda73ddca22f9a2d41351619cb682b06d9bfcf
12 files changed:
src/app/main.cpp
src/plugins/cpptools/cppfilesettingspage.cpp
src/plugins/debugger/gdb/gdboptionspage.ui
src/plugins/madde/maemodeviceconfigwizardreusekeyscheckpage.ui
src/plugins/madde/maemopackagecreationwidget.ui
src/plugins/madde/maemoqtversion.cpp
src/plugins/madde/qt4maemotarget.cpp
src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
src/plugins/qt4projectmanager/qt4nodes.cpp
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
src/plugins/texteditor/plaintexteditorfactory.cpp