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

Merge remote branch 'origin/development' into nsec3

Conflicts:
	.gitignore
	Knot.files
	Makefile
	src/dnslib/zone-dump.c
	src/dnslib/zone-load.c
	src/dnslib/zone.c
	src/dnslib/zone.h
	src/other/debug.h
	src/other/log.c
	src/server/name-server.c
	src/server/server.c

Added missing files to makefile, disabled hash table (bug).
Added dependency on libcrypto (OpenSSL).
Various other fixes.
parents fdb188f8 b4954b50
No related branches found
No related tags found
No related merge requests found
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