src/plugins/debugger/dumper.pro · bb00f59d66a87a63987f93f83db9d36b18be433b · Marco Bubke / flatpak-qt-creator

13 years ago

Merge remote-tracking branch 'origin/2.4' · e2b0835b

Eike Ziller authored 13 years ago

Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljstypedescriptionreader.cpp
	src/plugins/analyzerbase/startremotedialog.ui
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qt4projectmanager/makestep.cpp

Change-Id: If9d15a8c8f73106585fd8ce6ac47c253a40af6b1

e2b0835b

History

Merge remote-tracking branch 'origin/2.4'

Eike Ziller authored 13 years ago

Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljstypedescriptionreader.cpp
	src/plugins/analyzerbase/startremotedialog.ui
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qt4projectmanager/makestep.cpp

Change-Id: If9d15a8c8f73106585fd8ce6ac47c253a40af6b1