aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Christopher <echristo@gmail.com>2000-09-05 21:29:23 +0000
committerEric Christopher <echristo@gmail.com>2000-09-05 21:29:23 +0000
commitd95db692953c021efb5d1645ab74a1ab94b222e7 (patch)
tree480b9c41d9e745c05f9b38df83c5d91dde8d5ca5
parent1485d40032c2a26e45c2eb7f09967a74faa9307d (diff)
downloadgdb-d95db692953c021efb5d1645ab74a1ab94b222e7.zip
gdb-d95db692953c021efb5d1645ab74a1ab94b222e7.tar.gz
gdb-d95db692953c021efb5d1645ab74a1ab94b222e7.tar.bz2
fix of changelog
-rw-r--r--gas/ChangeLog14
1 files changed, 0 insertions, 14 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index b5eb820..c648754 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -420,22 +420,8 @@ Wed Aug 9 16:28:21 EDT 2000 Diego Novillo <dnovillo@cygnus.com>
* config/atof-ieee.c: Fix formatting.
* config/atof-tahoe.c: Likewise.
-2000-07-29 Marek Michalkiewicz <marekm@linux.org.pl>
-
-<<<<<<< ChangeLog
- * config/tc-avr.c: Use PARAMS macro in function declarations.
- Don't declare md_pcrel_from_section (already in tc-avr.h).
- (avr_operands): Use AVR_UNDEF_P and AVR_SKIP_P macros.
- (avr_operand): Don't set (unsigned) op_mask to -1.
-=======
2000-08-06 Nick Clifton <nickc@cygnus.com>
->>>>>>> 1.551
-
-<<<<<<< ChangeLog
-2000-08-04 Nick Clifton <nickc@cygnus.com>
-=======
->>>>>>> 1.551
* config/tc-sparc.c (md_begin): Fix typo in recent formatting
work.