dt c9c5fe1542 Merge remote branch 'origin/2.1' ...

Conflicts:
	share/qtcreator/static.pro
	src/plugins/qmljseditor/qmljshoverhandler.cpp
	src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp

2010-11-18 19:28:23 +01:00

27 KiB

Raw Blame History

View Raw