Frederik Gladhorn ea90032685 Merge remote-tracking branch 'origin/5.3' into dev ... Conflicts: src/network/ssl/qsslsocket_openssl_symbols.cpp Change-Id: Ic62419fa1fee5f4de6c372459d72e6e16f9a810b		2014-07-29 12:56:06 +02:00
..
access	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-29 12:56:06 +02:00
bearer	Fix crash in QNetworkAccessManager.	2014-05-19 15:52:58 +02:00
kernel	Android: Fix compilation of qhostaddress test	2014-06-30 08:59:45 +02:00
socket	Skip unstable autotests in QtBase.	2014-07-02 09:28:34 +02:00
ssl	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-10 10:11:11 +02:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00