diff options
author | Andrew Cagney <cagney@redhat.com> | 2001-07-10 23:02:29 +0000 |
---|---|---|
committer | Andrew Cagney <cagney@redhat.com> | 2001-07-10 23:02:29 +0000 |
commit | 37febd2b53a5289b36d449c826be749b125e2312 (patch) | |
tree | 1fd9b447ae110835ae9c88fd83c222657b540156 /gdb | |
parent | b51c76031a7287d6629083e94020afc93eddc42d (diff) | |
download | gdb-37febd2b53a5289b36d449c826be749b125e2312.zip gdb-37febd2b53a5289b36d449c826be749b125e2312.tar.gz gdb-37febd2b53a5289b36d449c826be749b125e2312.tar.bz2 |
Zap botched merge.
Diffstat (limited to 'gdb')
-rw-r--r-- | gdb/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index dedb0be..4f22b92 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -70,7 +70,6 @@ * valops.c (value_cast): When casting a pointer to an integer, don't convert it to an address. ->>>>>>> 1.1438 2001-07-10 Andrew Cagney <ac131313@redhat.com> * remote-utils.h (struct serial): Declare as opaque. Remove |