src/plugins/debugger/qml/qmlengine.h · 2395416b3790e164295f5b000aed67136ceb16ed · Tobias Hunger / qt-creator

13 years ago

Merge remote-tracking branch 'origin/2.5' · dbcaadd8

Oswald Buddenhagen authored 13 years ago

Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp
	src/plugins/qtsupport/gettingstartedwelcomepage.cpp

Change-Id: I9157b9b9c05564ddeb3c72cec6b59523b8165d76

dbcaadd8

History

Merge remote-tracking branch 'origin/2.5'

Oswald Buddenhagen authored 13 years ago

Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp
	src/plugins/qtsupport/gettingstartedwelcomepage.cpp

Change-Id: I9157b9b9c05564ddeb3c72cec6b59523b8165d76