qtbase

History

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

2013-05-26 20:54:51 +02:00

colordialogpanel.h

2013-05-26 20:54:51 +02:00

dialogs.pro

2013-03-05 18:39:35 +01:00

filedialogpanel.cpp

2013-06-04 19:34:36 +02:00

filedialogpanel.h

2013-06-04 19:34:36 +02:00

fontdialogpanel.cpp

2013-06-04 19:34:36 +02:00

fontdialogpanel.h

2013-06-04 19:34:36 +02:00

main.cpp

2013-05-26 20:54:51 +02:00

wizardpanel.cpp

2013-05-26 20:54:51 +02:00

wizardpanel.h

2013-05-26 20:54:51 +02:00