Merge remote branch 'origin/4.7' into 4.7
authorOlivier Goffart <ogoffart@trolltech.com>
Thu, 25 Mar 2010 19:27:05 +0000 (20:27 +0100)
committerOlivier Goffart <ogoffart@trolltech.com>
Thu, 25 Mar 2010 19:27:05 +0000 (20:27 +0100)
commit986873b239f15df43a3ebbc88a38f8ff8d6d07bf
tree946f585f390d3abb835a3280bbdc6bc90724977c
parentb7f48eee301e973fcfae08dfd8997538b6dbe251
parent3671dbf34940e166b747b6f8f3f5758fd486073c
Merge remote branch 'origin/4.7' into 4.7

Conflicts:
tools/qdoc3/generator.cpp
tools/qdoc3/node.cpp
tools/qdoc3/generator.cpp
tools/qdoc3/node.cpp