Commit a88d9ace authored by Samuel Thibault's avatar Samuel Thibault
Browse files

Merge branch 'master' into 'master' 

Haiku: proper path to resolv.conf for DNS server

See merge request slirp/libslirp!99
parents cdfbb3c2 71088655
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment