Liang Qi 3e71810cf3 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/network/access/qhttpnetworkconnection.cpp src/network/access/qhttpnetworkconnection_p.h Change-Id: I11f8641ef482efa8cee1b79977d19cc3182814b4		2016-10-08 17:15:55 +02:00
..
images	Merge remote-tracking branch 'origin/5.6' into dev	2015-10-14 15:45:35 +02:00
snippets	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-13 01:05:02 +02:00
src	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-08 17:15:55 +02:00
qtwidgets.qdocconf	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00