summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--newlib/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 551d7a530..8501c00b5 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -42,7 +42,6 @@
(CHEWOUT_FILES): Build documentation for memmem.
* libc/string/strings.tex: Include new docs.
->>>>>>> 1.1116
2008-01-08 Jeff Johnston <jjohnstn@redhat.com>
* libc/machine/m68k/memcpy.S: Remove % from register references