projects / external / glibc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: eb35b09)
Update.
authorUlrich Drepper <drepper@redhat.com>
Sat, 6 Sep 2003 09:56:57 +0000 (09:56 +0000)
committerUlrich Drepper <drepper@redhat.com>
Sat, 6 Sep 2003 09:56:57 +0000 (09:56 +0000)
ChangeLog patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 9040a40..35097f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,7 +37,6 @@
        * sysdeps/mach/hurd/mmap.c (__mmap): If io_map fails with MIG_BAD_ID,
        EOPNOTSUPP, or ENOSYS, change it to ENODEV.
 
->>>>>>> 1.7905
 2003-09-04  H.J. Lu  <hongjiu.lu@intel.com>
 
        * sysdeps/unix/sysv/linux/ia64/bits/sigstack.h (MINSIGSTKSZ):
Domain: System / Toolchain;