Frederik Gladhorn 190fa97c83 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: examples/widgets/doc/src/addressbook-fr.qdoc Change-Id: Id1196e8e0c6445f1616c3f29234c974d809f8e48		2013-08-27 22:51:09 +02:00
..
access	Merge remote-tracking branch 'origin/stable' into dev	2013-08-27 22:51:09 +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	tests: Make the QT assignments more explicit	2013-08-21 19:05:52 +02:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00