source-changes: CVS commit: src/include/arpa

Subject: CVS commit: src/include/arpa
To: None <source-changes@NetBSD.org>
From: Christos Zoulas <christos@netbsd.org>
List: source-changes
Date: 05/21/2004 02:25:10

Module Name:	src
Committed By:	christos
Date:		Fri May 21 02:25:10 UTC 2004

Modified Files:
	src/include/arpa: nameser.h

Log Message:
resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.15 -r1.16 src/include/arpa/nameser.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.