Liang Qi e918334045 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/widgets/dialogs/qcolordialog.cpp src/widgets/dialogs/qfiledialog.cpp tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp Change-Id: I34bc8a990f8f526889a95a5c7099ef557b9681ad		2016-09-28 11:51:35 +02:00
..
access	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-07-04 15:58:39 +02:00
bearer	Updated license headers	2016-01-21 18:55:18 +00:00
kernel	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00
socket	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-10 17:43:13 +02:00
ssl	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-09-28 11:51:35 +02:00
network.pro