OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove some extraneous conflict markers.

This commit is contained in:
Richard Earnshaw 2002-02-06 10:31:07 +00:00
parent 58fa08f090
commit a8ec217795
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdb/ChangeLog
View File

@ -128,7 +128,6 @@
* language.c (_initialize_language): Ditto.
* arc-tdep.c (_initialize_arc_tdep): Ditto.
>>>>>>> 1.2142
2002-02-04 Michael Snyder <msnyder@redhat.com>
* memattr.c (_initialize_mem): Elaborate the help for 'mem' command.
@ -412,7 +411,6 @@
read pseudo-register as well as real register.
(legacy_write_register_gen): Ditto.
>>>>>>> 1.2132
2002-01-28 Andrew Cagney <ac131313@redhat.com>
* config/mips/tm-wince.h (TARGET_BYTE_ORDER): Delete.