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

Merge remote branch 'origin/autotools' into development

Conflicts:
	Knot.files
	Makefile
	src/common.h
	src/ctl/knotc_main.c
	src/ctl/process.c
	src/dnslib/dnslib.h
	src/dnslib/response.c
	src/dnslib/response.h
	src/dnslib/rrset.h
	src/dnslib/rrsig.c
	src/dnslib/rrsig.h
	src/dnslib/zonedb.c
	src/main.c
	src/other/debug.h
	src/other/log.c
	src/server/name-server.h
	src/server/server.c
	src/server/server.h
	src/tests/dnslib/dnslib_rdata_tests.c
	src/tests/dnslib/dnslib_rrsig_set_tests.c
	src/tests/dnslib_tests.c
	src/tests/server_tests.c
	src/zoneparser/zoneparser.h

All conflicts resolved, but does not compile - need to properly add
  config sources to Makefiles and maybe fix some other problems.
parents ef72ed9a a0a774f8
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