Date: Sun, 20 Aug 1995 13:56:02 -0700 From: Peter Wemm <peter> To: CVS-commiters, cvs-usrsbin Subject: cvs commit: src/usr.sbin/named - Imported sources Message-ID: <199508202056.NAA18085@freefall.FreeBSD.org>
next in thread | raw e-mail | index | archive | help
peter 95/08/20 13:56:01 Branch: usr.sbin/named 1.1.1 Log: Import of Bind-4.9.3-beta24 Yes, there will be conflicts on just about every file. There is a significant mainline after the initial import, and the "-j" merge conflicts on the $Id$ lines... Yuck! (These comments apply to the rest of the imports) Obtained from: Paul Vixie <paul@vix.com> Status: Vendor Tag: VIXIE Release Tags: bind_4_9_3_b24 C src/usr.sbin/named/named.h C src/usr.sbin/named/db_dump.c C src/usr.sbin/named/db_glue.c C src/usr.sbin/named/db_load.c C src/usr.sbin/named/db_save.c C src/usr.sbin/named/db_update.c C src/usr.sbin/named/ns_forw.c C src/usr.sbin/named/ns_init.c C src/usr.sbin/named/ns_main.c C src/usr.sbin/named/ns_ncache.c U src/usr.sbin/named/ns_func.h C src/usr.sbin/named/ns_resp.c C src/usr.sbin/named/db_func.h C src/usr.sbin/named/ns_maint.c C src/usr.sbin/named/ns_req.c C src/usr.sbin/named/ns_defs.h C src/usr.sbin/named/ns_sort.c C src/usr.sbin/named/pathnames.h C src/usr.sbin/named/ns_validate.c U src/usr.sbin/named/Version.c C src/usr.sbin/named/db_lookup.c C src/usr.sbin/named/db_reload.c C src/usr.sbin/named/dmalloc.c C src/usr.sbin/named/dmalloc.h C src/usr.sbin/named/ns_stats.c C src/usr.sbin/named/storage.c C src/usr.sbin/named/db_defs.h C src/usr.sbin/named/db_glob.h C src/usr.sbin/named/ns_glob.h C src/usr.sbin/named/db_secure.c U src/usr.sbin/named/tree.h U src/usr.sbin/named/tree.c U src/usr.sbin/named/tree.man3 28 conflicts created by this import. Use the following command to help the merge: cvs checkout -jVIXIE:yesterday -jVIXIE src/usr.sbin/named
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199508202056.NAA18085>