projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d4aea63)
delete cvs merge cruft
authorKen Raeburn <raeburn@cygnus>
Tue, 4 Aug 1992 21:41:14 +0000 (21:41 +0000)
committerKen Raeburn <raeburn@cygnus>
Tue, 4 Aug 1992 21:41:14 +0000 (21:41 +0000)
gas/ChangeLog patch | blob | history

diff --git a/gas/ChangeLog b/gas/ChangeLog
index c154fa5d664f1b3154e353f30fe63505994e25bb..1d2c2450a5b27178b6161dcfb5aa238478a04037 100644 (file)
--- 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