Merge remote branch 'origin/0xdeadbeef' into ldns-to-dnslib
Conflicts: CuteDNS.files Makefile
No related branches found
No related tags found
Showing
- CuteDNS.files 4 additions, 6 deletionsCuteDNS.files
- Makefile 1 addition, 1 deletionMakefile
- src/alloc/malloc.c 43 additions, 0 deletionssrc/alloc/malloc.c
- src/alloc/malloc.h 27 additions, 0 deletionssrc/alloc/malloc.h
- src/alloc/slab.c 145 additions, 172 deletionssrc/alloc/slab.c
- src/alloc/slab.h 97 additions, 75 deletionssrc/alloc/slab.h
- src/common.h 4 additions, 1 deletionsrc/common.h
- src/main.c 1 addition, 0 deletionssrc/main.c
- src/other/malloc.c 0 additions, 84 deletionssrc/other/malloc.c
- src/other/malloc.h 0 additions, 26 deletionssrc/other/malloc.h
- src/server/server.c 1 addition, 0 deletionssrc/server/server.c
- src/server/tcp-handler.c 1 addition, 0 deletionssrc/server/tcp-handler.c
- src/stat/gatherer.c 1 addition, 1 deletionsrc/stat/gatherer.c
- src/stat/stat.c 5 additions, 6 deletionssrc/stat/stat.c
- src/tests/skiplist_tests.c 0 additions, 1 deletionsrc/tests/skiplist_tests.c
- src/tests/slab_tests.c 12 additions, 3 deletionssrc/tests/slab_tests.c
- src/zone/zonec.h 1 addition, 1 deletionsrc/zone/zonec.h
Loading
Please register or sign in to comment