Frederik Gladhorn e2776b44a0 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/plugins/platforms/cocoa/qcocoamenubar.mm Change-Id: I4a699fc8a7f30b2af9de8e496c3d5f027b7495bb		2013-06-12 19:17:07 +02:00
..
access	QSslConfiguration: add API to persist and resume SSL sessions	2013-05-10 09:15:55 +02:00
bearer	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
kernel	tst_qnetworkproxyfactory: Fix warnings about unused variables.	2013-06-07 14:54:33 +02:00
socket	QTcpSocket bind() auto test: return instead of QSKIP	2013-04-05 10:56:43 +02:00
ssl	SSL internals: do not write after shutting down the socket	2013-04-23 23:22:43 +02:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00