]> git.ipfire.org Git - thirdparty/unbound.git/commitdiff
Merge branch 'master' into rpz
authorRalph Dolmans <ralph@nlnetlabs.nl>
Mon, 9 Sep 2019 15:17:43 +0000 (17:17 +0200)
committerRalph Dolmans <ralph@nlnetlabs.nl>
Mon, 9 Sep 2019 15:17:43 +0000 (17:17 +0200)
1  2 
Makefile.in
util/net_help.c
util/net_help.h

diff --cc Makefile.in
Simple merge
diff --cc util/net_help.c
Simple merge
diff --cc util/net_help.h
Simple merge