Files
qt-creator/scripts
Oswald Buddenhagen dd45277a19 Merge remote branch 'origin/2.1'
Conflicts:
	share/qtcreator/templates/qmlapp/app.pro
	src/plugins/plugins.pro
	src/plugins/qt4projectmanager/qt4project.h
	src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
2010-11-04 19:18:45 +01:00
..
2010-01-29 21:33:57 +01:00
2010-10-15 18:28:32 +02:00