Merge "Merge branch 'newdocs'" into refs/staging/master
authorSamuel Rødal <samuel.rodal@digia.com>
Tue, 20 Nov 2012 11:16:16 +0000 (12:16 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 20 Nov 2012 13:13:07 +0000 (14:13 +0100)
commit9a6367a72aec4089cf00d62a4c93bc31b68af459
tree27f69c607efe0ab2ebc4942633c81485f9c5c494
parent6cac729ae4181414f0b80361cdae3c30a3c99ca1
parent0dc61c4216697a2c4066d4735b4be941e869e514
Merge "Merge branch 'newdocs'" into refs/staging/master