Eike Ziller 3bc622400d Merge remote-tracking branch 'origin/2.7' ...

Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp

Change-Id: Ic8590ad97d7349ed7601a49c4fd873ffc9a5f9b5

2013-03-12 10:56:52 +01:00

..

qtcreator

Merge remote-tracking branch 'origin/2.7'

2013-03-12 10:56:52 +01:00

share.pro

Include qbs files in qmake project tree

2012-10-16 12:07:53 +02:00

share.qbs

Adapt qbs project files to new installation approach.

2013-01-24 13:02:32 +01:00