about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-07-19 01:48:52 +0000
committerUlrich Drepper <drepper@redhat.com>1999-07-19 01:48:52 +0000
commita982226402abb950a184a06daffb430e55e085f7 (patch)
tree62d302b632155261cd387c59e2a2d4993fe68fe2
parentc486fcdf4161b389425dd9ac01ac36aa4bddc3d6 (diff)
downloadglibc-a982226402abb950a184a06daffb430e55e085f7.tar.gz
glibc-a982226402abb950a184a06daffb430e55e085f7.tar.xz
glibc-a982226402abb950a184a06daffb430e55e085f7.zip
Update.
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2534a77bb1..ae77791374 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -76,7 +76,6 @@
 	* sysdeps/generic/bits/types.h: Likewise.
 	* posix/sys/types.h: Define suseconds_t for X/Open.
 
->>>>>>> 1.2438
 1999-07-15  Ulrich Drepper  <drepper@cygnus.com>
 
 	* stdio-common/bug1.c: Avoid memory leak.