Oswald Buddenhagen e426d08e54 Merge remote-tracking branch 'origin/4.0' ...

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/debugger/debuggerruncontrol.cpp

Change-Id: I81b43480a1369e3d7be60ae26e812dda6b962b0b

2016-04-01 17:31:39 +02:00

7.1 KiB

Raw Blame History

View Raw