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
..
configure	Merge remote-tracking branch 'origin/stable' into dev	2013-06-04 19:34:36 +02:00
shared/windows	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00