Eike Ziller 5c121d5791 Merge remote-tracking branch 'origin/4.11' ...

Conflicts:
	src/plugins/genericprojectmanager/genericproject.cpp

Change-Id: Ib54f1645ec70a9e6460a888a13190ede130bccca

2020-02-05 11:59:35 +01:00

..

qml

Doc: Rearrange files in the doc folder

2020-01-27 09:05:07 +00:00

main.cpp

Merge remote-tracking branch 'origin/4.11'

2020-02-05 11:59:35 +01:00

progressbar.pro

Doc: Rearrange files in the doc folder

2020-01-27 09:05:07 +00:00

qml.qrc

Doc: Rearrange files in the doc folder

2020-01-27 09:05:07 +00:00