Merge branch 'development' into axfr-out
Showing
- samples/knot.conf.sample 13 additions, 0 deletionssamples/knot.conf.sample
- src/common/slab/alloc-common.h 1 addition, 1 deletionsrc/common/slab/alloc-common.h
- src/dnslib/zone-dump.c 2 additions, 2 deletionssrc/dnslib/zone-dump.c
- src/dnslib/zone-dump.h 1 addition, 1 deletionsrc/dnslib/zone-dump.h
- src/dnslib/zone-load.c 42 additions, 19 deletionssrc/dnslib/zone-load.c
- src/knot/conf/cf-lex.l 9 additions, 0 deletionssrc/knot/conf/cf-lex.l
- src/knot/conf/cf-parse.y 9 additions, 3 deletionssrc/knot/conf/cf-parse.y
- src/knot/conf/conf.c 12 additions, 3 deletionssrc/knot/conf/conf.c
- src/knot/conf/conf.h 2 additions, 0 deletionssrc/knot/conf/conf.h
- src/knot/ctl/knotc_main.c 4 additions, 2 deletionssrc/knot/ctl/knotc_main.c
- src/zcompile/tests/zcompile_tests.c 1 addition, 1 deletionsrc/zcompile/tests/zcompile_tests.c
- src/zcompile/zcompile.c 4 additions, 2 deletionssrc/zcompile/zcompile.c
- src/zcompile/zcompile.h 3 additions, 1 deletionsrc/zcompile/zcompile.h
- src/zcompile/zcompile_main.c 6 additions, 2 deletionssrc/zcompile/zcompile_main.c
Please register or sign in to comment