Frederik Gladhorn 9033977d39 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/global/qglobal.h src/corelib/tools/qstring.cpp src/gui/image/image.pri src/gui/image/qimage.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/eglfs/qeglfshooks_stub.cpp tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp Change-Id: I3b9ba029c8f2263b011f204fdf68c3231c6d4ce5		2014-01-20 18:18:59 +01:00
..
access	Merge remote-tracking branch 'origin/stable' into dev	2014-01-20 18:18:59 +01:00
bearer	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
kernel	Merge remote-tracking branch 'origin/stable' into dev	2014-01-20 18:18:59 +01:00
socket	Merge remote-tracking branch 'origin/stable' into dev	2014-01-20 18:18:59 +01:00
ssl	Merge remote-tracking branch 'origin/stable' into dev	2014-01-20 18:18:59 +01:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00