From owner-freebsd-commit Sat Jan 6 22:57:37 1996 Return-Path: owner-commit Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id WAA20441 for freebsd-commit-outgoing; Sat, 6 Jan 1996 22:57:37 -0800 (PST) Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id WAA20432 for cvs-all-outgoing; Sat, 6 Jan 1996 22:57:32 -0800 (PST) Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id WAA20422 for cvs-lib-outgoing; Sat, 6 Jan 1996 22:57:30 -0800 (PST) Received: (from peter@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id WAA20410 Sat, 6 Jan 1996 22:57:28 -0800 (PST) Date: Sat, 6 Jan 1996 22:57:28 -0800 (PST) From: Peter Wemm Message-Id: <199601070657.WAA20410@freefall.freebsd.org> To: CVS-committers, cvs-lib Subject: cvs commit: src/lib/libc/net - Imported sources Sender: owner-commit@FreeBSD.ORG Precedence: bulk peter 96/01/06 22:57:28 Branch: lib/libc/net 1.1.1 Log: Part of bind-4.9.3-rel.. This is for my convenience and reference. This import to the vendor branch changes no files... Status: Vendor Tag: VIXIE Release Tags: v4_9_3_rel C src/lib/libc/net/res_comp.c N src/lib/libc/net/res_data.c C src/lib/libc/net/res_debug.c C src/lib/libc/net/res_init.c C src/lib/libc/net/res_mkquery.c C src/lib/libc/net/res_query.c C src/lib/libc/net/res_send.c 6 conflicts created by this import. Use the following command to help the merge: cvs checkout -jVIXIE:yesterday -jVIXIE src/lib/libc/net