about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-09-29 18:00:18 +0000
committerUlrich Drepper <drepper@redhat.com>2004-09-29 18:00:18 +0000
commit6fe62f537bf01399818996ff8c7fa818ef58c664 (patch)
tree088a2a61ca5b4153c971d1628b32276441192775
parentc1a10b519a308dacb73a4f6ce971dad678e233e1 (diff)
downloadglibc-6fe62f537bf01399818996ff8c7fa818ef58c664.tar.gz
glibc-6fe62f537bf01399818996ff8c7fa818ef58c664.tar.xz
glibc-6fe62f537bf01399818996ff8c7fa818ef58c664.zip
Update.
	Renamed from si_flags due to conflict with si_flags from <elf.h>.
-rw-r--r--ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6fd8932010..1f1d967ccd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2004-09-29  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/ia64/bits/siginfo.h (si_segvflags):
-	Renamed from si_flags due to comflict with si_flags from <elf.h>.
+	Renamed from si_flags due to conflict with si_flags from <elf.h>.
 
 2004-09-28  Ulrich Drepper  <drepper@redhat.com>