OSDN Git Service

Merge remote branch 'origin/2.1'
authorcon <qtc-committer@nokia.com>
Wed, 5 Jan 2011 09:42:01 +0000 (10:42 +0100)
committercon <qtc-committer@nokia.com>
Wed, 5 Jan 2011 09:42:01 +0000 (10:42 +0100)
1  2 
doc/qtcreator.qdoc
src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.cpp

Simple merge