Merge remote-tracking branch 'gerrit/newdocs' into HEAD master_1353405889 master_1353421254 master_1353447035 master_1353484898 69/40069/1
authorSamuel Rødal <samuel.rodal@digia.com>
Tue, 20 Nov 2012 10:00:21 +0000 (11:00 +0100)
committerSamuel Rødal <samuel.rodal@digia.com>
Tue, 20 Nov 2012 10:00:40 +0000 (11:00 +0100)
Change-Id: I1eeb68710f8129660f8d83dae924b23eda1401a5

1  2 
qt.pro

diff --cc qt.pro
Simple merge