Merge remote branch 'origin/development' into controller
Conflicts: CuteDNS.files Makefile
No related branches found
No related tags found
Showing
- CuteDNS.files 9 additions, 21 deletionsCuteDNS.files
- Makefile 1 addition, 1 deletionMakefile
- deprecated/dns/dns-simple.c 0 additions, 711 deletionsdeprecated/dns/dns-simple.c
- deprecated/dns/dns-simple.h 0 additions, 129 deletionsdeprecated/dns/dns-simple.h
- deprecated/dns/dns-utils.c 0 additions, 112 deletionsdeprecated/dns/dns-utils.c
- deprecated/dns/dns-utils.h 0 additions, 9 deletionsdeprecated/dns/dns-utils.h
- deprecated/zone-data-structure.c 0 additions, 64 deletionsdeprecated/zone-data-structure.c
- deprecated/zone-data-structure.h 0 additions, 93 deletionsdeprecated/zone-data-structure.h
- deprecated/zone-database.c 0 additions, 1316 deletionsdeprecated/zone-database.c
- deprecated/zone-database.h 0 additions, 172 deletionsdeprecated/zone-database.h
- deprecated/zone-node.c 0 additions, 803 deletionsdeprecated/zone-node.c
- deprecated/zone-node.h 0 additions, 284 deletionsdeprecated/zone-node.h
- deprecated/zone-parser.c 0 additions, 343 deletionsdeprecated/zone-parser.c
- deprecated/zone-parser.h 0 additions, 40 deletionsdeprecated/zone-parser.h
- src/lib/bitset.c 0 additions, 0 deletionssrc/lib/bitset.c
- src/lib/bitset.h 0 additions, 0 deletionssrc/lib/bitset.h
- src/lib/dynamic-array.c 0 additions, 0 deletionssrc/lib/dynamic-array.c
- src/lib/dynamic-array.h 0 additions, 0 deletionssrc/lib/dynamic-array.h
- src/lib/skip-list.c 0 additions, 0 deletionssrc/lib/skip-list.c
- src/lib/skip-list.h 0 additions, 0 deletionssrc/lib/skip-list.h
Loading
Please register or sign in to comment