Liang Qi 28628a5d5e Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/plugins/platforms/eglfs/qeglfshooks.cpp Change-Id: I483f0dbd876943b184803f0fe65a0c686ad75db2		2016-10-22 21:19:57 +02:00
..
access	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-22 21:19:57 +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