OSDN Git Service

Merge remote branch 'origin/2.0'
authorcon <qtc-committer@nokia.com>
Tue, 4 May 2010 15:48:38 +0000 (17:48 +0200)
committercon <qtc-committer@nokia.com>
Tue, 4 May 2010 15:48:38 +0000 (17:48 +0200)
commita186982d4f2f51e8651d66804d155d530ace22d6
treecde401e1e13ff68713fc5750d9f6ee7f22c88666
parent08f522d93c45010da10a2ebcc1d41692cd66303a
parent5e3eb47e556c252d97a4b66dd031918e313d7901
Merge remote branch 'origin/2.0'

Conflicts:
doc/qt-html-templates.qdocconf
doc/qtcreator.qdocconf