Liang Qi 24fba6744c Merge remote-tracking branch 'origin/5.9' into 5.10 ... Conflicts: tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp Change-Id: Ib6dd965a7eb6f59103e276b3407739147ecd37b2		2018-01-07 14:47:19 +01:00
..
unixmake2.cpp	Merge remote-tracking branch 'origin/5.9' into 5.10	2018-01-07 14:47:19 +01:00
unixmake.cpp	make mkspecs not mess up -rpath-link	2017-05-31 12:57:14 +00:00
unixmake.h	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-26 16:27:28 +01:00