diff options
author | Kung Hsu <kung@cygnus> | 1993-10-01 19:14:04 +0000 |
---|---|---|
committer | Kung Hsu <kung@cygnus> | 1993-10-01 19:14:04 +0000 |
commit | 5c7473b1df37760aa0492d0b22cb8c48212bea1c (patch) | |
tree | 35c6910d679d1acdcf95f279ed80780dda6bb095 | |
parent | 6cb30309d593b71dbfc229bbd80f694c32279528 (diff) | |
download | gdb-5c7473b1df37760aa0492d0b22cb8c48212bea1c.zip gdb-5c7473b1df37760aa0492d0b22cb8c48212bea1c.tar.gz gdb-5c7473b1df37760aa0492d0b22cb8c48212bea1c.tar.bz2 |
Modified Files:
ChangeLog
* Fix cvs conflict parts.
-rw-r--r-- | gdb/ChangeLog | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 94e79b8..bbaf1a5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,20 +1,7 @@ -<<<<<<< ChangeLog Fri Oct 1 10:06:35 1993 Kung Hsu (kung@cirdan.cygnus.com) * symtab.c: fix a bug in testsuite (virtfunc.exp) -Wed Sep 29 10:53:24 1993 Kung Hsu (kung@cirdan.cygnus.com) - - * cp-valprint.c: change vtble field name to __vtbl (pr2695) - - * symtab.c: fix a bug in gdb_mangle_name, to get mangled name right - -<<<<<<< ChangeLog -Wed Sep 29 09:50:11 1993 Kung Hsu (kung@cirdan.cygnus.com) - - * c-valprint.c: to fix virtual table print bug (pr2695) - -======= Thu Sep 30 11:30:56 1993 Jim Kingdon (kingdon@lioth.cygnus.com) * m88k-nat.c (fill_gregset): Fix typo (R_SFIP -> R_FIP). |