Files
qt-creator/share/qtcreator/qml/qmlpuppet/qml2puppet
Eike Ziller 5ad724c61b Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	src/plugins/qmakeprojectmanager/qmakeproject.cpp

Change-Id: Ieb1c3e946f11d3c4fa1ee6b5afdf83cc532d8aed
2020-09-17 10:28:19 +02:00
..
2020-06-16 14:34:59 +00:00