src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp · 09bf431ab578dcc02f46b7ae2c75da38c1cfa58e · Tobias Hunger / qt-creator

14 years ago

con authored 14 years ago

Conflicts:
	doc/qtcreator.qdoc
	src/plugins/find/currentdocumentfind.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp

38f6379f

con authored 14 years ago

Conflicts:
	doc/qtcreator.qdoc
	src/plugins/find/currentdocumentfind.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp