Merge remote-tracking branch 'gerrit/master' into newdocs
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>
Fri, 26 Oct 2012 10:28:31 +0000 (12:28 +0200)
committerTor Arne Vestbø <tor.arne.vestbo@digia.com>
Fri, 26 Oct 2012 10:28:53 +0000 (12:28 +0200)
Change-Id: I10cf9f915c602c8e5a0e7d7c9e17b7bc5ca00640

1  2 
configure
src/gui/doc/qtgui.qdocconf
tools/configure/configureapp.cpp

diff --cc configure
Simple merge
Simple merge
Simple merge