Files
qt-creator/doc
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
..
2010-03-05 09:54:21 +01:00
2010-03-05 11:28:13 +01:00
2010-05-07 17:33:24 +02:00
2008-12-02 12:01:29 +01:00