Thiago Macieira c374f4441a Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev		2013-08-22 02:04:39 +02:00
..
access	QNetworkReply auto test: adapt to new session life time	2013-08-21 14:48:04 +02:00
bearer	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
kernel	Further followup to Q_OS_MACX changes.	2013-06-24 15:49:31 +02:00
socket	Include sockLib header to enable usage of socket functions on VxWorks	2013-08-06 11:00:23 +02:00
ssl	test: Skip some more qsslsocket flaky tests [part 2]	2013-08-16 17:08:24 +02:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00