Files
qt-creator/src/plugins/qt4projectmanager/qt-maemo
hjk 5805788290 Merge remote branch 'origin/2.0'
Conflicts:
	src/plugins/projectexplorer/miniprojecttargetselector.cpp
	src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
	src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
	tests/manual/gdbdebugger/simple/app.cpp
2010-05-27 11:11:53 +02:00
..
2010-05-21 16:24:38 +02:00
2009-10-16 18:01:07 +02:00