Files
qt-creator/src/tools/qml2puppet/qml2puppet/instances/objectnodeinstance.h
Eike Ziller 211d6507c3 Merge remote-tracking branch 'origin/qds/dev'
Conflicts:
	src/plugins/updateinfo/updateinfoplugin.cpp

Change-Id: Ie1bf2ad434f0224fb91caf91b443daae3d5b5ec0
2023-01-12 09:07:27 +01:00

7.9 KiB