Merge branch 'master' into branch-1.4prep
Conflicts: .gitignore Knot.files
Showing
- .gitignore 0 additions, 2 deletions.gitignore
- Knot.files 0 additions, 4 deletionsKnot.files
- configure.ac 19 additions, 4 deletionsconfigure.ac
- doc/configuration.texi 2 additions, 2 deletionsdoc/configuration.texi
- doc/knot.texi 1 addition, 0 deletionsdoc/knot.texi
- doc/reference.texi 18 additions, 3 deletionsdoc/reference.texi
- doc/running.texi 21 additions, 10 deletionsdoc/running.texi
- man/kdig.1.in 1 addition, 1 deletionman/kdig.1.in
- man/khost.1.in 1 addition, 1 deletionman/khost.1.in
- man/knot.conf.5.in 1 addition, 1 deletionman/knot.conf.5.in
- man/knotc.8.in 1 addition, 1 deletionman/knotc.8.in
- man/knotd.8.in 1 addition, 1 deletionman/knotd.8.in
- man/knsupdate.1.in 1 addition, 1 deletionman/knsupdate.1.in
- samples/Makefile.am 12 additions, 9 deletionssamples/Makefile.am
- samples/knot.full.conf 3 additions, 3 deletionssamples/knot.full.conf
- samples/knot.sample.conf.in 8 additions, 8 deletionssamples/knot.sample.conf.in
- src/Makefile.am 3 additions, 2 deletionssrc/Makefile.am
- src/common/evqueue.c 0 additions, 3 deletionssrc/common/evqueue.c
- src/common/evqueue.h 0 additions, 17 deletionssrc/common/evqueue.h
- src/knot/conf/cf-parse.y 1 addition, 5 deletionssrc/knot/conf/cf-parse.y
Please register or sign in to comment