Oswald Buddenhagen 52bf71fbdf Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	README
	tests/auto/debugger/tst_dumpers.cpp

Change-Id: Ib9aef37a246bc3bb9bca0c32a902af3b09ef3146

2014-03-11 13:39:55 +01:00

..

qtcreator

Merge remote-tracking branch 'origin/3.1'

2014-03-11 13:39:55 +01:00

share.pro

Include qbs files in qmake project tree

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

share.qbs

Fix qbs build.

2013-09-27 10:31:22 +02:00