src/plugins/qt4projectmanager/qt4project.h · 40dd86b672eadc2a3363cb22cd9d6dd2badcda5e · Tobias Hunger / qt-creator

14 years ago

Merge remote branch 'origin/2.1' · dd45277a

Oswald Buddenhagen authored 14 years ago

Conflicts:
	share/qtcreator/templates/qmlapp/app.pro
	src/plugins/plugins.pro
	src/plugins/qt4projectmanager/qt4project.h
	src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri

dd45277a

History

Merge remote branch 'origin/2.1'

Oswald Buddenhagen authored 14 years ago

Conflicts:
	share/qtcreator/templates/qmlapp/app.pro
	src/plugins/plugins.pro
	src/plugins/qt4projectmanager/qt4project.h
	src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri