Liang Qi ee0951d69b Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/network/access/qftp.cpp src/widgets/itemviews/qheaderview.cpp src/widgets/itemviews/qlistview.cpp tests/auto/network/access/qftp/tst_qftp.cpp Change-Id: I9f928f25d45d8944dd60bb583f649fc1615bc5d9		2016-04-07 10:47:20 +02:00
..
access	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-07 10:47:20 +02:00
bearer	Updated license headers	2016-01-21 18:55:18 +00:00
kernel	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-26 16:27:28 +01:00
socket	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-04 08:59:18 +02:00
ssl	Updated license headers	2016-01-21 18:55:18 +00:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00