aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorK. Richard Pixley <rich@cygnus>1992-03-14 03:09:49 +0000
committerK. Richard Pixley <rich@cygnus>1992-03-14 03:09:49 +0000
commit37dfec76fdcf4da5bc04ca354d7d7bb08b49faec (patch)
tree0f6c982ede21d5882a9539a087f7eacb83f8f5be
parent95a925b8f1d92ed6955007dff0dd1ee7ff1771d6 (diff)
downloadgdb-37dfec76fdcf4da5bc04ca354d7d7bb08b49faec.zip
gdb-37dfec76fdcf4da5bc04ca354d7d7bb08b49faec.tar.gz
gdb-37dfec76fdcf4da5bc04ca354d7d7bb08b49faec.tar.bz2
fix cvs merge detritus
-rw-r--r--gas/ChangeLog3
1 files changed, 0 insertions, 3 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 9b6a501..b560ebc 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,15 +1,12 @@
-<<<<<<< ChangeLog
Fri Mar 13 15:45:44 1992 K. Richard Pixley (rich@cygnus.com)
* Makefile.in: pass down MAKEINFO explicitly on info.
-=======
Fri Mar 13 08:03:03 1992 Steve Chamberlain (sac@thepub.cygnus.com)
* flonum-const.c: renamed flonum-konst.c to stop dos name
conflict.
->>>>>>> 1.43
Wed Mar 11 23:32:42 1992 K. Richard Pixley (rich@cygnus.com)
* configure.in: vxworks68 gets te-sun3.h.