src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp · afba921111bbdf8bcd8c79383cc38579f3c74008 · Tobias Hunger / qt-creator

15 years ago

Thomas Hartmann authored 15 years ago

Conflicts:
	src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp

1f940786

Thomas Hartmann authored 15 years ago

Conflicts:
	src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp