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)
commit2d23374a6f88bac2f5f2d7f0528e9e554b4a4cbb
tree5b27e35d6767778c028d2f3b9ca37b4545c04a59
parent7f2c22e8910f43728f13d76aa2c50c29a19f3ee0
parent9456528aac80c6d4c41fa96d88696dc55414b710
Merge "Merge branch 'docs-refactoring' into master" into refs/staging/master
src/widgets/dialogs/qcolordialog.cpp
src/widgets/dialogs/qdialog.cpp
src/widgets/dialogs/qfiledialog.cpp
src/widgets/dialogs/qfontdialog.cpp