git.ipfire.org Git - thirdparty/unbound.git/commit

]> git.ipfire.org Git - thirdparty/unbound.git/commit

projects / thirdparty / unbound.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 201b949 62152e0)

author	George Thessalonikefs <george@nlnetlabs.nl>
	Mon, 23 Nov 2020 15:58:30 +0000 (16:58 +0100)
committer	George Thessalonikefs <george@nlnetlabs.nl>
	Mon, 23 Nov 2020 15:58:30 +0000 (16:58 +0100)
commit	b0247b6e93eb908b2a584eef80e11ee495d37071
tree	36a908d9e1a569732c46031f33c6ed59f74da242	tree
parent	201b9496895104240ba3bfa06e03d46bab1a60bc	commit \| diff
parent	62152e0493a16a0d6caad8c62ecd723b2b5308bc	commit \| diff

Merge branch 'master' into edns-string

doc/unbound.conf.5.in	diff1 \|	diff2 \|	blob \| history
services/outside_network.c	diff1 \|	diff2 \|	blob \| history
testcode/fake_event.c	diff1 \|	diff2 \|	blob \| history
util/config_file.c	diff1 \|	diff2 \|	blob \| history
util/config_file.h	diff1 \|	diff2 \|	blob \| history
util/configlexer.c	diff1 \|	diff2 \|	blob \| history
util/configlexer.lex	diff1 \|	diff2 \|	blob \| history
util/configparser.c	diff1 \|	diff2 \|	blob \| history
util/configparser.h	diff1 \|	diff2 \|	blob \| history
util/configparser.y	diff1 \|	diff2 \|	blob \| history

Mirror of https://github.com/NLnetLabs/unbound.git