Merge remote branch 'qt-doc-team/4.8'
authorCasper van Donderen <casper.vandonderen@nokia.com>
Mon, 29 Aug 2011 08:53:38 +0000 (10:53 +0200)
committerCasper van Donderen <casper.vandonderen@nokia.com>
Mon, 29 Aug 2011 08:53:38 +0000 (10:53 +0200)
commit5cd6323211aac99599f38a6c7363ae52b2b5bd02
treed6908a49dbdcf7942122a9e9e91e6cd1653c38e8
parent02e2ff4597a7fe81ecbb4b1ef3c5e4a5ac6b7339
parent516ffeecded9ed20ef309143b5f15bcce4abbe60
Merge remote branch 'qt-doc-team/4.8'

Conflicts:
doc/src/declarative/righttoleft.qdoc
tools/qdoc3/ditaxmlgenerator.cpp
tools/qdoc3/generator.h
tools/qdoc3/htmlgenerator.cpp
doc/src/platforms/symbian-introduction.qdoc
tools/qdoc3/ditaxmlgenerator.cpp
tools/qdoc3/doc.cpp
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/htmlgenerator.h
tools/qdoc3/node.cpp
tools/qdoc3/node.h