This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
PATCH Remove extraneous conflict markers from ChangeLog
- From: Richard Earnshaw <rearnsha at arm dot com>
- To: gdb-patches at sources dot redhat dot com
- Cc: Richard dot Earnshaw at arm dot com
- Date: Wed, 06 Feb 2002 10:33:25 +0000
- Subject: PATCH Remove extraneous conflict markers from ChangeLog
- Organization: ARM Ltd.
- Reply-to: Richard dot Earnshaw at arm dot com
It seems that someone didn't properly clean up the ChangeLog file after a
merge conflict.
Committed as obvious.
R.
Index: ChangeLog
===================================================================
RCS file: /cvs/src/src/gdb/ChangeLog,v
retrieving revision 1.2146
diff -p -r1.2146 ChangeLog
*** ChangeLog 2002/02/06 09:27:29 1.2146
--- ChangeLog 2002/02/06 10:30:26
***************
*** 128,134 ****
* 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.
--- 128,133 ----
***************
*** 412,418 ****
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.
--- 411,416 ----