Frederik Gladhorn 7c495cfea9 Merge remote-tracking branch 'origin/5.3' into dev ... Conflicts: src/gui/text/qfontengine_qpf2.cpp Change-Id: Ib04f92c41d0edd55d3aef8fb1708d917fba0f2a8		2014-07-14 10:35:51 +02:00
..
access	Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev	2014-07-01 18:41:14 +02:00
bearer	Fix crash in QNetworkAccessManager.	2014-05-19 15:52:58 +02:00
doc	Doc: Removed "url" variable from qdocconf files.	2014-07-04 12:12:29 +02:00
kernel	Expose internally QAuthenticator::setRealm	2014-07-07 15:04:45 +02:00
socket	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-01 16:25:19 +02:00
ssl	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-14 10:35:51 +02:00
network.pro	Android: New bearer plugin	2014-07-10 23:09:31 +02:00