Merge "Merge branch 'docs-refactoring' into master" into refs/staging/master
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>
Thu, 10 May 2012 07:56:00 +0000 (09:56 +0200)
committerQt by Nokia <qt-info@nokia.com>
Thu, 10 May 2012 09:34:25 +0000 (11:34 +0200)
1  2 
src/widgets/dialogs/qcolordialog.cpp
src/widgets/dialogs/qdialog.cpp
src/widgets/dialogs/qfiledialog.cpp
src/widgets/dialogs/qfontdialog.cpp

Simple merge
Simple merge
Simple merge
Simple merge