Frederik Gladhorn 084c5b3db7 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp Change-Id: I18a9d83fc14f4a9afdb1e40523ec51e3fa1d7754		2013-07-23 11:18:11 +02:00
..
access	Merge remote-tracking branch 'origin/stable' into dev	2013-07-23 11:18:11 +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	Merge remote-tracking branch 'origin/stable' into dev	2013-07-23 11:18:11 +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