Liang Qi 23a36fd2bf Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/corelib/io/qprocess_win.cpp src/widgets/itemviews/qheaderview.cpp Change-Id: I0a59ade9cd6e91f770fdf298a7d72a41e79fd761		2016-04-27 09:18:05 +02:00
..
crashingServer	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-27 09:18:05 +02:00
test	fix usage of wince scope	2015-06-05 10:29:10 +00:00
.gitignore
BLACKLIST	Blacklist and skip various tests that are flakey	2015-06-14 10:50:45 +00:00
qtcpserver.pro
tst_qtcpserver.cpp	Updated license headers	2016-01-21 18:55:18 +00:00