From owner-cvs-all Mon Nov 6 8:48:47 2000 Delivered-To: cvs-all@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4DE5537B4D7; Mon, 6 Nov 2000 08:48:45 -0800 (PST) Received: (from asmodai@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id IAA14705; Mon, 6 Nov 2000 08:48:45 -0800 (PST) (envelope-from asmodai@FreeBSD.org) Message-Id: <200011061648.IAA14705@freefall.freebsd.org> From: Jeroen Ruigrok van der Werven Date: Mon, 6 Nov 2000 08:48:45 -0800 (PST) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/contrib/bind/bin/named ns_req.c X-FreeBSD-CVS-Branch: RELENG_4 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG asmodai 2000/11/06 08:48:45 PST Modified files: (Branch: RELENG_4) contrib/bind/bin/named ns_req.c Log: Resolve conflicts on aa_patch merge. Revision Changes Path 1.1.1.2.2.3 +15 -11 src/contrib/bind/bin/named/ns_req.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message