From 6fe62f537bf01399818996ff8c7fa818ef58c664 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 29 Sep 2004 18:00:18 +0000
Subject: Update.

	Renamed from si_flags due to conflict with si_flags from <elf.h>.
---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ChangeLog')

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>
 
-- 
cgit 1.4.1