peter 3ceb3f9b38 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

Merge in delta from 4.9.3.b9 -> 4.9.3.b24.

1995-08-20 21:19:18 +00:00

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

Import of Bind-4.9.3-beta24

1995-08-20 20:55:55 +00:00

db_save.c

Merge in delta from 4.9.3.b9 -> 4.9.3.b24.

1995-08-20 21:19:18 +00:00

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

Import of Bind-4.9.3-beta24

1995-08-20 20:55:55 +00:00

Makefile

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

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

named.8

Fold in conflict related changes after beta26 merge.

1995-10-23 11:11:58 +00:00

named.h

Import of Bind-4.9.3-beta24

1995-08-20 20:55:55 +00:00

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

Merge in delta from 4.9.3.b9 -> 4.9.3.b24.

1995-08-20 21:19:18 +00:00

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

Import of Bind-4.9.3-beta24

1995-08-20 20:55:55 +00:00

portability.h

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

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

storage.c

Merge in delta from 4.9.3.b9 -> 4.9.3.b24.

1995-08-20 21:19:18 +00:00

tree.c

Fold in conflict related changes after beta26 merge.

1995-10-23 11:11:58 +00:00

tree.h

Merge in delta from 4.9.3.b9 -> 4.9.3.b24.

1995-08-20 21:19:18 +00:00

Version.c

Import of Bind-4.9.3-beta24

1995-08-20 20:55:55 +00:00