Subject: CVS commit: src/lib/libc/resolv
To: None <>
From: Christos Zoulas <>
List: source-changes
Date: 11/07/2004 02:25:01
Module Name:	src
Committed By:	christos
Date:		Sun Nov  7 02:25:01 UTC 2004

Modified Files:
	src/lib/libc/resolv: res_debug.c res_send.c

Log Message:
resolve conflicts.

To generate a diff of this commit:
cvs rdiff -r1.6 -r1.7 src/lib/libc/resolv/res_debug.c \

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