Peter Wemm 34d59b1442 Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

..

tools

Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

xfer

Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

db_defs.h

…

db_dump.c

Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

db_func.h

Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

db_glob.h

Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

db_glue.c

Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

db_load.c

Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

db_lookup.c

Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

db_reload.c

…

db_save.c

…

db_secure.c

Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

db_update.c

Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

dmalloc.c

Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

dmalloc.h

…

Makefile

Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

named.8

…

named.h

…

ns_defs.h

Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

ns_forw.c

Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

ns_func.h

At last.. :-) Import of bind-4.9.3-REL. (part 1 of several)

1996-01-07 05:22:00 +00:00

ns_glob.h

Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

ns_init.c

Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

ns_main.c

Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

ns_maint.c

Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

ns_ncache.c

Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

ns_req.c

Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

ns_resp.c

Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

ns_sort.c

Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

ns_stats.c

…

ns_validate.c

Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

options.h

Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

pathnames.h

…

portability.h

Round 1 of the conflict merge. It now compiles..

1996-01-07 05:48:49 +00:00

storage.c

…

tree.c

…

tree.h

…

Version.c

…