• Oswald Buddenhagen's avatar
    Merge branch '2.2' · dc3c156c
    Oswald Buddenhagen authored
    Conflicts:
    	src/plugins/debugger/gdb/pythongdbengine.cpp
    	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
    	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
    	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
    	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
    	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
    	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
    	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
    	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
    	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
    	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
    	src/plugins/qt4projectmanager/qt4target.cpp
    	src/plugins/qt4projectmanager/qt4target.h
    	src/plugins/qt4projectmanager/qtoptionspage.h
    	src/plugins/qt4projectmanager/qtversionmanager.cpp
    	src/plugins/welcome/welcomemode.cpp
    dc3c156c
abi.cpp 25.6 KB