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-11-03 17:47:41 +01:00
2010-11-03 17:47:41 +01:00
2010-11-03 17:47:41 +01:00
2010-11-03 17:47:41 +01:00
2010-11-04 09:21:10 +01:00
2010-11-03 17:47:41 +01:00
2010-11-03 17:47:41 +01:00
2010-11-04 14:09:47 +01:00
2010-11-03 17:47:41 +01:00
2010-11-04 19:18:45 +01:00
2010-11-03 17:47:41 +01:00
2010-11-03 17:47:41 +01:00
2010-11-03 17:47:41 +01:00
2010-11-03 17:47:41 +01:00
2010-11-03 17:47:41 +01:00
2010-11-03 17:47:41 +01:00
2010-11-03 17:47:41 +01:00
2010-11-03 17:47:41 +01:00
2010-11-03 17:47:41 +01:00
2010-11-03 17:47:41 +01:00
2010-11-03 17:47:41 +01:00
2010-11-03 17:47:41 +01:00
2010-11-04 19:18:45 +01:00
2010-11-03 17:47:41 +01:00
2010-11-03 17:47:41 +01:00
2010-11-03 17:47:41 +01:00
2010-11-04 19:18:45 +01:00
2010-03-05 11:28:13 +01:00
2010-11-03 17:47:41 +01:00
2010-11-03 17:47:41 +01:00
2010-11-03 17:47:41 +01:00
2010-11-03 17:47:41 +01:00
2010-11-03 17:47:41 +01:00
2010-11-03 17:47:41 +01:00
2010-11-03 17:47:41 +01:00
2010-11-04 15:42:43 +01:00