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: 99fd6cf b7e8dc1)

author	W.C.A. Wijngaards <wouter@nlnetlabs.nl>
	Fri, 15 May 2020 12:52:53 +0000 (14:52 +0200)
committer	W.C.A. Wijngaards <wouter@nlnetlabs.nl>
	Fri, 15 May 2020 12:52:53 +0000 (14:52 +0200)
commit	edcef1827487fcef699ecff95dbe90c96a001233
tree	aa5d87c9a9ed47ae13b6b22e46b2f39e2bb10ceb	tree \| snapshot
parent	99fd6cf7118389128c8016d211f1f432abcab523	commit \| diff
parent	b7e8dc1182c0ba1b4c5eeeb967ab336fd6a82ae2	commit \| diff

Merge branch 'master' of git://github.com/PMunch/unbound into PMunch-master
Fixed conflicts in Makefile.in and configparser.y

14 files changed:

Makefile.in	diff1 \|	diff2 \|	blob \| history
config.h.in	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
daemon/remote.c	diff1 \|	diff2 \|	blob \| history
doc/example.conf.in	diff1 \|	diff2 \|	blob \| history
doc/unbound.conf.5.in	diff1 \|	diff2 \|	blob \| history
libunbound/unbound.h	diff1 \|	diff2 \|	blob \| history
smallapp/unbound-control.c	diff1 \|	diff2 \|	blob \| history
util/config_file.c	diff1 \|	diff2 \|	blob \| history
util/config_file.h	diff1 \|	diff2 \|	blob \| history
util/configlexer.lex	diff1 \|	diff2 \|	blob \| history
util/configparser.y	diff1 \|	diff2 \|	blob \| history
util/fptr_wlist.c	diff1 \|	diff2 \|	blob \| history

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