Merge remote branch 'origin/development' into nsec3
Conflicts: .gitignore Knot.files Makefile src/dnslib/zone-dump.c src/dnslib/zone-load.c src/dnslib/zone.c src/dnslib/zone.h src/other/debug.h src/other/log.c src/server/name-server.c src/server/server.c Added missing files to makefile, disabled hash table (bug). Added dependency on libcrypto (OpenSSL). Various other fixes.
Showing
- .gitignore 16 additions, 1 deletion.gitignore
- AUTHORS 4 additions, 0 deletionsAUTHORS
- COPYING 674 additions, 0 deletionsCOPYING
- ChangeLog 0 additions, 0 deletionsChangeLog
- CodingStyle 1 addition, 1 deletionCodingStyle
- CuteDNS.includes 0 additions, 2 deletionsCuteDNS.includes
- Doxy.page.h 9 additions, 9 deletionsDoxy.page.h
- INSTALL 365 additions, 0 deletionsINSTALL
- Knot.config 0 additions, 0 deletionsKnot.config
- Knot.creator 0 additions, 0 deletionsKnot.creator
- Knot.files 59 additions, 46 deletionsKnot.files
- Knot.includes 13 additions, 0 deletionsKnot.includes
- Makefile 0 additions, 116 deletionsMakefile
- Makefile.am 2 additions, 0 deletionsMakefile.am
- NEWS 0 additions, 0 deletionsNEWS
- README 0 additions, 0 deletionsREADME
- configure.ac 58 additions, 0 deletionsconfigure.ac
- ltmain.sh 8413 additions, 0 deletionsltmain.sh
- m4/libtool.m4 7377 additions, 0 deletionsm4/libtool.m4
- m4/ltoptions.m4 368 additions, 0 deletionsm4/ltoptions.m4
Please register or sign in to comment