From 6a361b2e92b4a8de5df3f9c3b8dae8a2b73f60b2 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Sun, 19 Dec 2004 23:23:55 +0000
Subject: [PATCH] * iconv/iconvconfig.c (nostdlib, output_file,
 output_file_len):

	New variables.
	(options, parse_opt, main): Take new options --nostdlib and
	--output/-o to set them.  Under --nostdlib, skip GCONV_PATH dirs.
	(write_output): If output_file is set, write the output there.

2004-12-19  Andreas Jaeger  <aj@suse.de>NULL
---
 ChangeLog | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1005ff5..839475d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-2004-12-19  Andreas Jaeger  <aj@suse.de>
+2004-12-19  Roland McGrath  <roland@redhat.com>
+
+	* iconv/iconvconfig.c (nostdlib, output_file, output_file_len):
+	New variables.
+	(options, parse_opt, main): Take new options --nostdlib and
+	--output/-o to set them.  Under --nostdlib, skip GCONV_PATH dirs.
+	(write_output): If output_file is set, write the output there.
+
+2004-12-19  Andreas Jaeger  <aj@suse.de>NULL
 
 	[BZ #560]
 	* inet/netinet/in.h: Use __interface_addr instead of __interface.
-- 
2.7.4