Eike Ziller 829a08047f Merge remote-tracking branch 'origin/4.9' ...

Conflicts:
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp

Change-Id: I473084232ab99c18e2316154656de0035af02628

2019-05-17 12:47:24 +02:00

..

file.pro

JsonWizard: Replace EmptyProjectWizard with a JsonWizard

2014-11-03 09:44:24 +01:00

wizard.json

Merge remote-tracking branch 'origin/4.9'

2019-05-17 12:47:24 +02:00