Merge branch '4.7' into mimir
authorMorten Engvoldsen <morten.engvoldsen@nokia.com>
Wed, 23 Feb 2011 20:32:21 +0000 (21:32 +0100)
committerMorten Engvoldsen <morten.engvoldsen@nokia.com>
Wed, 23 Feb 2011 20:32:21 +0000 (21:32 +0100)
commitc881e33e7e510204fabd061dac08a00b10b432fb
treeb5a5210eef8d309a17aca7d20b457879b584913f
parent309c48a70b46678ef92da441fcc2dc96ceb8fcf3
parent3c982b5d214cc7a37ace1d956ac8fb0b9a281722
Merge branch '4.7' into mimir
tools/qdoc3/doc/qdoc-manual.qdoc