From 9bfaeaffc7af8b067148b96fb03581a6ec6c5471 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 18 Jun 1999 19:06:16 +0000
Subject: [PATCH] Update.

---
 ChangeLog | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4d5c07767d6..4019e0f48b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+1999-06-18  H.J. Lu  <hjl@gnu.org>
+
+	* localedata/Makefile (charmaps): Exclude SCCS.
+	(locales): Likewise.
+	(repertoiremaps): Likewise.
+
+1999-06-18  Ulrich Drepper  <drepper@cygnus.com>
+
+	* sysdeps/generic/bsd-_setjmp.c: Include setjmp.h.
+	* sysdeps/generic/bsd-setjmp.c: Likewise.
+
 1999-06-17  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
 
 	* sysdeps/unix/sysv/linux/bits/ioctl-types.h: Add missing line
@@ -16,14 +27,14 @@
 
 1999-06-16  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
 
-        * sysdeps/unix/sysv/linux/netax25/ax25.h (AX25_PIDINCL): Added.
+	* sysdeps/unix/sysv/linux/netax25/ax25.h (AX25_PIDINCL): Added.
 
 1999-06-14  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
 
-        * sysdeps/unix/sysv/linux/sys/sysmacros.h [!__GNUC__]: Use correct
-        word order.
-        * sysdeps/unix/sysv/linux/alpha/sys/sysmacros.h: New file.
-        * sysdeps/unix/sysv/linux/sparc/sys/sysmacros.h: New file.
+	* sysdeps/unix/sysv/linux/sys/sysmacros.h [!__GNUC__]: Use correct
+	word order.
+	* sysdeps/unix/sysv/linux/alpha/sys/sysmacros.h: New file.
+	* sysdeps/unix/sysv/linux/sparc/sys/sysmacros.h: New file.
 
 1999-06-17  Ulrich Drepper  <drepper@cygnus.com>
 
-- 
2.47.3