Merge branch 'master' into rose
Conflicts: src/Makefile.am
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- Doxyfile 4 additions, 5 deletionsDoxyfile
- Knot.config 0 additions, 1 deletionKnot.config
- Knot.files 76 additions, 77 deletionsKnot.files
- Knot.includes 1 addition, 7 deletionsKnot.includes
- Makefile.am 2 additions, 2 deletionsMakefile.am
- configure.ac 8 additions, 7 deletionsconfigure.ac
- doc/configuration.rst 3 additions, 3 deletionsdoc/configuration.rst
- doc/installation.rst 3 additions, 4 deletionsdoc/installation.rst
- doc/running.rst 34 additions, 90 deletionsdoc/running.rst
- libknot.pc.in 11 additions, 0 deletionslibknot.pc.in
- m4/ax_set_version_info.m4 178 additions, 0 deletionsm4/ax_set_version_info.m4
- man/knotc.8.in 22 additions, 19 deletionsman/knotc.8.in
- man/knotd.8.in 2 additions, 4 deletionsman/knotd.8.in
- src/Makefile.am 141 additions, 133 deletionssrc/Makefile.am
- src/common-knot/LICENSE.txt 0 additions, 29 deletionssrc/common-knot/LICENSE.txt
- src/common-knot/crc.h 0 additions, 77 deletionssrc/common-knot/crc.h
- src/dnstap/reader.c 1 addition, 0 deletionssrc/dnstap/reader.c
- src/knot/common/debug.h 319 additions, 14 deletionssrc/knot/common/debug.h
- src/knot/common/evsched.c 1 addition, 1 deletionsrc/knot/common/evsched.c
Loading
Please register or sign in to comment