Frederik Gladhorn 5e8ae03578 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: configure qmake/generators/mac/pbuilder_pbx.cpp src/corelib/kernel/qtimerinfo_unix.cpp src/plugins/platforms/cocoa/qcocoabackingstore.mm src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/windows/qwindowswindow.cpp src/plugins/platforms/xcb/qglxintegration.cpp Change-Id: I8d125fe498f5304874e6976b53f588d3e98a66ac		2013-03-05 13:42:11 +01:00
..
pbuilder_pbx.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-03-05 13:42:11 +01:00
pbuilder_pbx.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00