con 7f4cbe2383 Merge remote branch 'origin/2.0' ...

Conflicts:
	src/plugins/debugger/moduleshandler.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp

2010-05-20 09:28:00 +02:00

12 KiB

Raw Blame History

View Raw