Frederik Gladhorn 627d9cbd3c Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/plugins/platforms/windows/qwindowsdialoghelpers.cpp Change-Id: I4ca87d44129fa5c1d8541cd58b8d62bc69080688		2013-01-24 16:02:55 +01:00
..
access	QNetworkReply auto test: also test uploading data via HTTPS	2013-01-18 17:58:48 +01:00
bearer	Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev	2013-01-23 22:12:54 +01:00
kernel	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
socket	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
ssl	QSslConfiguration: toggle on demand loading of root certs properly	2013-01-23 19:36:07 +01:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00