Sergio Ahumada 3ef6cf060e Merge branch 'stable' into dev ... Conflicts: qmake/generators/mac/pbuilder_pbx.cpp src/corelib/json/qjsonwriter.cpp src/corelib/kernel/qeventdispatcher_blackberry.cpp src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm Change-Id: I24df576c4cbd18fa51b03122f71e32bb83b9028f		2013-07-11 16:42:01 +02:00
..
configure	Merge branch 'stable' into dev	2013-07-11 16:42:01 +02:00
shared/windows	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00