Oswald Buddenhagen dc3c156cac Merge branch '2.2' ...

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

2011-04-14 12:39:31 +02:00

..

tests

Update license.

2011-04-13 11:49:28 +02:00

c++

Renamed two cplusplus projects to not conflict with the autotests.

2010-09-15 11:50:24 +02:00

conf.c++

Renamed two cplusplus projects to not conflict with the autotests.

2010-09-15 11:50:24 +02:00

cplusplus-frontend.pro

tests: Fix a linking issue.

2011-04-07 13:33:22 +02:00

main.cpp

Update license.

2011-04-13 11:49:28 +02:00