Frederik Gladhorn f4900d340a Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/widgets/styles/qmacstyle_mac.mm Change-Id: If8326db9e7da3cbf45dbf7475fdff9915c7723b1		2013-02-18 16:14:52 +01:00
..
qsslcertificate	Fix loading of SSL certificate of DER files.	2013-02-08 17:37:51 +01:00
qsslcipher	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qsslerror	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qsslkey	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qsslsocket	Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev	2013-02-17 20:31:38 +01:00
qsslsocket_onDemandCertificates_member	Fix developer-build of qsslsocket_onDemandCertificates_member.	2013-02-12 17:56:10 +01:00
qsslsocket_onDemandCertificates_static	QSslSocket tests: use qt-project.org as test server instd of codereview	2013-01-29 13:00:38 +01:00
ssl.pro	Only compile SSL tests when openssl is available.	2013-02-13 23:56:41 +01:00