Merge branch '4.8'
authorCasper van Donderen <casper.vandonderen@nokia.com>
Tue, 30 Aug 2011 08:44:54 +0000 (10:44 +0200)
committerCasper van Donderen <casper.vandonderen@nokia.com>
Tue, 30 Aug 2011 08:44:54 +0000 (10:44 +0200)
commit214a26fbde1c5600a10db59217ae9b63a46bce9e
tree601e9edf2832834f0ffef9c7b5c54303ce2f70d2
parent7f27ebb0383414f15f391151655e5b09952f8ccd
parentad203bc0bd17be1ade143e38cdc7e8eca26ebc07
Merge branch '4.8'

Conflicts:
doc/src/declarative/righttoleft.qdoc
doc/src/development/qmake-manual.qdoc
doc/src/platforms/symbian-introduction.qdoc
tools/qdoc3/cppcodemarker.cpp
tools/qdoc3/node.cpp