OSDN Git Service

Merge remote branch 'origin/2.1'
authorcon <qtc-committer@nokia.com>
Wed, 12 Jan 2011 09:20:46 +0000 (10:20 +0100)
committercon <qtc-committer@nokia.com>
Wed, 12 Jan 2011 09:20:46 +0000 (10:20 +0100)
commitf46a87a6f5e2a5069e4d80abf48cd48dd568a9c3
treef6a057050af8df431f6baf720d46f527bdadd1db
parenta444cdc7aa7bcbe13485748536892822adcc3c8c
parent9a7e4865a5c9cf1fce9a10436e25ebb80ae0d069
Merge remote branch 'origin/2.1'

Conflicts:
src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp
doc/qtcreator.qdoc
doc/qtcreator.qdocconf
doc/symbiandev.qdoc
share/qtcreator/gdbmacros/dumper.py
src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp