Merge remote branch 'origin/development' into zoneparser
Conflicts: src/zoneparser/zoneparser.c
No related branches found
No related tags found
Showing
- CuteDNS.files 48 additions, 50 deletionsCuteDNS.files
- Doxy.page.h 57 additions, 0 deletionsDoxy.page.h
- Doxyfile 8 additions, 8 deletionsDoxyfile
- Makefile 20 additions, 10 deletionsMakefile
- src/alloc/slab.c 5 additions, 2 deletionssrc/alloc/slab.c
- src/common.h 20 additions, 2 deletionssrc/common.h
- src/dnslib/dname.c 75 additions, 17 deletionssrc/dnslib/dname.c
- src/dnslib/dname.h 3 additions, 1 deletionsrc/dnslib/dname.h
- src/dnslib/response.c 45 additions, 4 deletionssrc/dnslib/response.c
- src/dnslib/response.h 25 additions, 6 deletionssrc/dnslib/response.h
- src/dnslib/tolower.h 107 additions, 107 deletionssrc/dnslib/tolower.h
- src/dnslib/zone-dump.c 10 additions, 10 deletionssrc/dnslib/zone-dump.c
- src/dnslib/zone-dump.h 3 additions, 3 deletionssrc/dnslib/zone-dump.h
- src/dnslib/zone-load.c 188 additions, 60 deletionssrc/dnslib/zone-load.c
- src/dnslib/zone-load.h 3 additions, 3 deletionssrc/dnslib/zone-load.h
- src/dnslib/zone.c 127 additions, 6 deletionssrc/dnslib/zone.c
- src/dnslib/zone.h 16 additions, 2 deletionssrc/dnslib/zone.h
- src/dnslib/zonedb.c 4 additions, 18 deletionssrc/dnslib/zonedb.c
- src/dnslib/zonedb.h 0 additions, 12 deletionssrc/dnslib/zonedb.h
- src/hash/cuckoo-hash-table.c 2 additions, 0 deletionssrc/hash/cuckoo-hash-table.c
Loading
Please register or sign in to comment