Skip to content
Snippets Groups Projects
Commit c3870c9d authored by Lubos Slovak's avatar Lubos Slovak
Browse files

Merge branch 'development' into errors

Conflicts:
	Knot.files
	src/Makefile.am
	src/common/latency.h
	src/common/slab/slab.c
	src/dnslib/dname.c
	src/dnslib/edns.c
	src/dnslib/node.c
	src/dnslib/nsec3.c
	src/dnslib/response.c
	src/dnslib/utils.h
	src/dnslib/zone.c
	src/dnslib/zone.h
	src/dnslib/zonedb.c
	src/knot/server/dthreads.c

Note: moved other/error.h/.c to knot/other/
parents ed5e13c7 81475ba8
No related branches found
No related tags found
No related merge requests found
Showing with 205 additions and 162 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment