Allan Sandfeld Jensen fa9d12f4a2 Merge remote-tracking branch 'origin/5.10' into dev ... Conflicts: src/plugins/platforms/windows/qwindowsmousehandler.cpp src/plugins/platforms/xcb/qxcbimage.cpp tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/manual/qtabletevent/regular_widgets/main.cpp Done-with: Friedemann Kleint<Friedemann.Kleint@qt.io> Done-with: Mårten Nordheim<marten.nordheim@qt.io> Change-Id: I5b2499513a92c590ed0756f7d2e93c35a64b7f30		2017-10-24 13:40:55 +02:00
..
access	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-24 13:40:55 +02:00
bearer	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-03-13 15:55:44 +01:00
kernel	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-24 13:40:55 +02:00
socket	Merge remote-tracking branch 'origin/5.10' into dev	2017-09-26 16:14:54 +02:00
ssl	Merge remote-tracking branch 'origin/5.10' into dev	2017-10-17 10:34:24 +02:00
network.pro	…