Files
qt-creator/share/qtcreator/qml/qmlpuppet/commands
Eike Ziller 267946d100 Merge remote-tracking branch 'origin/4.11'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/boot2qt/qdbrunconfiguration.cpp
	src/plugins/boot2qt/qdbrunconfiguration.h
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
	src/plugins/qnx/qnxrunconfiguration.cpp
	src/plugins/remotelinux/remotelinuxrunconfiguration.h

Change-Id: I17c8e1bf300bb75d7317ccf7749dd3cc07709c21
2019-12-16 16:19:44 +01: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
2018-07-25 12:53:26 +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