src/knot/zone/node.c · 7b31f60de991c35771b14594d4570c974158c1ec · Daniel Kahn Gillmor / Knot DNS · GitLab

Self sign-up has been disabled due to increased spam activity. If you want to get access, please send an email to a project owner (preferred) or at gitlab(at)nic(dot)cz. We apologize for the inconvenience.

Apr 10, 2014
7e20800f
Merge remote-tracking branch 'origin/master' into rem_wildcard_child · 7e20800f
Jan Kadlec authored Apr 10, 2014
```
Conflicts:
	src/knot/zone/node.c
	src/knot/zone/node.h
	src/knot/zone/zone-contents.c
	src/knot/zone/zone-contents.h
```
7e20800f
Merge remote-tracking branch 'origin/master' into rem_wildcard_child
Jan Kadlec authored Apr 10, 2014
```
Conflicts:
	src/knot/zone/node.c
	src/knot/zone/node.h
	src/knot/zone/zone-contents.c
	src/knot/zone/zone-contents.h
```