Oswald Buddenhagen f1cec4629e Merge remote-tracking branch 'origin/2.6' ...

Conflicts:
	src/libs/utils/tooltip/tips.cpp
	src/plugins/coreplugin/versiondialog.cpp
	src/plugins/projectexplorer/kitinformationconfigwidget.cpp
	src/plugins/qnx/blackberryapplicationrunner.cpp
	src/plugins/qnx/blackberrydeployconfiguration.cpp
	src/plugins/qnx/blackberrydeployconfiguration.h
	src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp

Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b

2013-01-29 15:52:36 +01:00

..

test.py

Merge remote-tracking branch 'origin/2.6'

2013-01-29 15:52:36 +01:00