src/plugins/qt4projectmanager/qt4project.cpp · 48d54004429bca78f0913169f214dada37d582af · Tobias Hunger / qt-creator

16 years ago

Oswald Buddenhagen authored 16 years ago

Conflicts:
	doc/qtcreator.qdoc
	src/plugins/qt4projectmanager/qt4project.cpp
	src/tools/qpatch/qpatch.cpp

2593c779

Oswald Buddenhagen authored 16 years ago

Conflicts:
	doc/qtcreator.qdoc
	src/plugins/qt4projectmanager/qt4project.cpp
	src/tools/qpatch/qpatch.cpp