Commit ca6dda73 authored by Evan Hunt's avatar Evan Hunt

Merge branch 'fix-windows' into 'master'

move ws2_32.lib to the end of AdditionalDependencies

See merge request !761
parents f6c08a28 f8d9bd61
Pipeline #4681 failed with stages
in 9 minutes and 44 seconds