Eike Ziller 69fa7a8ffb Merge remote-tracking branch 'origin/4.0' into 4.1 ...

Conflicts:
	src/plugins/projectexplorer/runconfiguration.h
	tests/unit/unittest/unittest.pro

Change-Id: I3d327b1198df2a7e9268916af9624ce5d21195df

2016-06-28 11:42:03 +02:00

4.2 KiB

Raw Blame History

View Raw