Frederik Gladhorn 80604a0786 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/global/qglobal.h src/plugins/platforms/cocoa/qnsview.mm Change-Id: I6fe345df5c417cb7a55a3f91285d9b47a22c04fa		2013-06-04 19:34:36 +02:00
..
colordialogpanel.cpp	Update manualtests license to say "part of test suite".	2013-05-26 20:54:51 +02:00
colordialogpanel.h	Update manualtests license to say "part of test suite".	2013-05-26 20:54:51 +02:00
dialogs.pro	Manual dialog test: Add a page for QWizard.	2013-03-05 18:39:35 +01:00
filedialogpanel.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-06-04 19:34:36 +02:00
filedialogpanel.h	Merge remote-tracking branch 'origin/stable' into dev	2013-06-04 19:34:36 +02:00
fontdialogpanel.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-06-04 19:34:36 +02:00
fontdialogpanel.h	Merge remote-tracking branch 'origin/stable' into dev	2013-06-04 19:34:36 +02:00
main.cpp	Update manualtests license to say "part of test suite".	2013-05-26 20:54:51 +02:00
wizardpanel.cpp	Update manualtests license to say "part of test suite".	2013-05-26 20:54:51 +02:00
wizardpanel.h	Update manualtests license to say "part of test suite".	2013-05-26 20:54:51 +02:00