aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4c306f4..9d0199d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -28,7 +28,6 @@
* config/i386/gmm_malloc.h: New file.
->>>>>>> 2.4781
2004-08-03 Dale Johannesen <dalej@apple.com>
* config/rs6000/rs6000.c (machopic_output_stub): Align Darwin stubs.