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
..
.gitattributes	Moved network autotests into new directory structure	2011-09-09 09:32:17 +02:00
.gitignore	Moved network autotests into new directory structure	2011-09-09 09:32:17 +02:00
BLACKLIST	tests: blacklist the data row which uses internet in tst_qftp.cpp	2015-11-17 14:47:33 +00:00
qftp.pro	Blacklist some cases from tst_qftp	2015-08-03 06:54:21 +00:00
rfc3252.txt	Moved network autotests into new directory structure	2011-09-09 09:32:17 +02:00
tst_qftp.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-07 10:47:20 +02:00