.gitignore · 63ae53d2f00a55e2b9fcd86c32176d6b7369c0c1 · Daniel Kahn Gillmor / Knot DNS

Source project has a limited visibility.

11 years ago

Merge branch 'branch-1.4prep' into feature-dnssec · 5c769b5a

Lubos Slovak authored 11 years ago

Conflicts:
	src/Makefile.am
	src/knot/conf/conf.c
	src/libknot/dnssec/key.c
	src/libknot/updates/changesets.c
	src/libknot/zone/zone-contents.c
	src/libknot/zone/zone-diff.c

5c769b5a

History

Merge branch 'branch-1.4prep' into feature-dnssec

Lubos Slovak authored 11 years ago

Conflicts:
	src/Makefile.am
	src/knot/conf/conf.c
	src/libknot/dnssec/key.c
	src/libknot/updates/changesets.c
	src/libknot/zone/zone-contents.c
	src/libknot/zone/zone-diff.c

Admin message