Merge remote branch 'origin/development' into dnslib-new
Conflicts: src/dnslib/zone-load.c src/tests/dnslib/dnslib_response_tests.c
Showing
- CuteDNS.files 48 additions, 50 deletionsCuteDNS.files
- Doxy.page.h 30 additions, 22 deletionsDoxy.page.h
- Makefile 15 additions, 8 deletionsMakefile
- src/alloc/slab.c 5 additions, 2 deletionssrc/alloc/slab.c
- src/common.h 18 additions, 2 deletionssrc/common.h
- src/dnslib/dname.c 51 additions, 17 deletionssrc/dnslib/dname.c
- src/dnslib/dname.h 1 addition, 1 deletionsrc/dnslib/dname.h
- src/dnslib/response.c 43 additions, 3 deletionssrc/dnslib/response.c
- src/dnslib/response.h 25 additions, 6 deletionssrc/dnslib/response.h
- src/dnslib/zone-dump.c 1 addition, 1 deletionsrc/dnslib/zone-dump.c
- src/dnslib/zone-dump.h 3 additions, 3 deletionssrc/dnslib/zone-dump.h
- src/dnslib/zone-load.c 179 additions, 52 deletionssrc/dnslib/zone-load.c
- src/dnslib/zone-load.h 3 additions, 3 deletionssrc/dnslib/zone-load.h
- src/dnslib/zonedb.c 0 additions, 18 deletionssrc/dnslib/zonedb.c
- src/dnslib/zonedb.h 0 additions, 12 deletionssrc/dnslib/zonedb.h
- src/main.c 91 additions, 18 deletionssrc/main.c
- src/other/log.c 2 additions, 2 deletionssrc/other/log.c
- src/other/log.h 3 additions, 0 deletionssrc/other/log.h
- src/server/dthreads.c 6 additions, 1 deletionsrc/server/dthreads.c
- src/server/dthreads.h 1 addition, 1 deletionsrc/server/dthreads.h
Loading
Please register or sign in to comment