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
..
images	Move the statemachine documentation into qtcore	2012-08-18 08:34:53 +02:00
snippets	Merge remote-tracking branch 'origin/stable' into dev	2013-03-05 13:42:11 +01:00
src	Merge remote-tracking branch 'origin/stable' into dev	2013-03-05 13:42:11 +01:00
qtcore.qdocconf	fix doc page urls	2013-02-04 14:28:24 +01:00