7829fad4093f2c1985b1efb7cea00287ff015d2b |
|
20-Jun-2012 |
ckb <ckb@isc.org> |
merging fast format zone files
Conflicts:
.gitignore
bin/named/zoneconf.c
bin/tests/.gitignore
bin/tests/system/autosign/tests.sh
bin/tests/system/masterformat/clean.sh
bin/tests/system/masterformat/ns1/compile.sh
bin/tests/system/masterformat/tests.sh
configure
lib/dns/db.c
lib/dns/include/dns/db.h
lib/dns/include/dns/types.h
lib/dns/master.c
lib/dns/masterdump.c
lib/dns/rbt.c
lib/dns/rbtdb.c
lib/dns/sdb.c
lib/dns/sdlz.c
lib/dns/tests/.cvsignore
lib/dns/tests/Makefile.in
lib/dns/win32/libdns.def
lib/dns/xfrin.c
lib/dns/zone.c
lib/export/dns/Makefile.in
lib/isc/include/isc/file.h
lib/isc/unix/file.c
lib/isc/win32/file.c
lib/isccfg/namedconf.c |