Eike Ziller cec29f34ea Merge remote-tracking branch 'origin/4.2' into 4.3 ...

Conflicts:
	doc/src/qtcreator.qdoc
	tests/system/suite_general/suite.conf

Change-Id: Ia298b177d6920a1d853e342b62cf98f7c48a278a

2017-03-09 12:14:55 +01:00

..

imports

Merge remote-tracking branch 'origin/4.2' into 4.3

2017-03-09 12:14:55 +01:00

modules

Version bump

2017-01-23 15:41:41 +00:00