-
Lubos Slovak authored
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.
a911f256