diff options
| author | Ken Raeburn <raeburn@cygnus> | 1992-08-04 21:41:14 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@cygnus> | 1992-08-04 21:41:14 +0000 |
| commit | c7a535938ed0ac4a601897462e0012ed7b2430e1 (patch) | |
| tree | c620a07d4eeb47b58350a37ddf85c90a7dcc170e | |
| parent | d4aea631b382f32b2dc68d990daac1e07b126da7 (diff) | |
| download | gdb-c7a535938ed0ac4a601897462e0012ed7b2430e1.zip gdb-c7a535938ed0ac4a601897462e0012ed7b2430e1.tar.gz gdb-c7a535938ed0ac4a601897462e0012ed7b2430e1.tar.bz2 | |
delete cvs merge cruft
| -rw-r--r-- | gas/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index c154fa5..1d2c245 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -117,7 +117,6 @@ Mon Jun 1 16:20:22 1992 Michael Tiemann (tiemann@cygnus.com) * configure.in: recognize m680x0 as having sun3 emulation mode for vxworks environment. ->>>>>>> 1.62 Sun May 31 05:33:00 1992 david d `zoo' zuhn (zoo@cygnus.com) * configure.in: recognize m680x0 as an m68k |