Eike Ziller db4311d5b5 Merge remote-tracking branch 'origin/2.6' ...

Conflicts:
	dist/gdb/Makefile.osx
	src/libs/qmldebug/qmldebug.qbs
	src/plugins/android/androidsettingswidget.cpp

Change-Id: I85627130b575f7d08f416dea52031fa72019b217

2012-10-04 12:23:39 +02:00

..

patches

Debugger: Using gdb 7.5 in build scripts.

2012-09-24 11:05:20 +02:00

Makefile.linux

Merge remote-tracking branch 'origin/2.6'

2012-10-04 12:23:39 +02:00

Makefile.mingw

Merge remote-tracking branch 'origin/2.6'

2012-10-04 12:23:39 +02:00

Makefile.osx

Merge remote-tracking branch 'origin/2.6'

2012-10-04 12:23:39 +02:00