]> git.ipfire.org Git - thirdparty/unbound.git/commitdiff
projects / thirdparty / unbound.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ae823f 2541ccb)
Merge branch 'master' into doh 255/head
authorRalph Dolmans <ralph@nlnetlabs.nl>
Fri, 18 Sep 2020 10:05:53 +0000 (12:05 +0200)
committerRalph Dolmans <ralph@nlnetlabs.nl>
Fri, 18 Sep 2020 10:05:53 +0000 (12:05 +0200)
1  2 
util/config_file.c patch | diff1 | diff2 | blob | history

diff --cc util/config_file.c
Simple merge
Mirror of https://github.com/NLnetLabs/unbound.git