OSDN Git Service

Merge remote branch 'origin/2.1'
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Tue, 23 Nov 2010 14:44:45 +0000 (15:44 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Tue, 23 Nov 2010 14:44:58 +0000 (15:44 +0100)
commitf3b5c98bf50d5559c43d19a41d375dfb6fd5fc94
tree487b3e21941530218d7f8bf5b3bb5437c6ccc13f
parent5689e904fe66f90c20a8f36610adf762624b53fe
parent84515448e8d137a6c5218c27bfee84d5241cb327
Merge remote branch 'origin/2.1'
doc/qtcreator.qdoc
doc/qtcreator.qdocconf
src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp
src/plugins/qmlprojectmanager/fileformat/filefilteritems.h
src/plugins/qt4projectmanager/qt4nodes.cpp
src/plugins/qt4projectmanager/qtversionmanager.cpp