Files
qt-creator/share/qtcreator/qml/qmlpuppet/commands
Tim Jenssen b8cd87dea0 Merge remote-tracking branch 'origin/qds-1.59' into 4.13
Conflicts:
	src/plugins/clangformat/clangformatplugin.cpp
	src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
	src/plugins/qmldesigner/qmldesigner.qbs

Change-Id: Ie4a0beeb9fd32ac9683f4e8769988a9c3f3e369a
2020-06-26 16:51:22 +02:00
..
2018-07-25 12:53:26 +00:00
2018-07-25 12:53:26 +00:00
2018-07-25 12:53:26 +00:00
2020-05-14 15:21:52 +00:00
2018-07-25 12:53:26 +00:00
2018-07-25 12:53:26 +00:00
2018-07-25 12:53:26 +00:00