dt 6b6d9871b8 Merge remote branch 'origin/2.1' ...

Conflicts:
	share/qtcreator/templates/mobileapp/app.pro
	share/qtcreator/templates/qmlapp/app.pro
	src/plugins/cpptools/cpptools.pro

2010-10-04 16:07:46 +02:00

..

auto

Merge remote branch 'origin/2.1'

2010-10-04 16:07:46 +02:00

manual

Merge remote branch 'origin/2.1'

2010-10-04 16:07:46 +02:00

qt4projectmanager/test1

Initial import

2008-12-02 12:01:29 +01:00

tests.pro

Add missing tests root project file

2010-07-14 15:08:27 +10:00