Eike Ziller efa5a7b6d7 Merge remote-tracking branch 'origin/4.4' ...

Conflicts:
	qtcreator.pri

Change-Id: If5f4a9821a23ac0df81eb84b3980f9cf7ecd70ba

2017-07-25 11:54:44 +02:00

..

imports

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

2017-07-10 09:54:52 +02:00

modules

Merge remote-tracking branch 'origin/4.4'

2017-07-25 11:54:44 +02:00