This is the mail archive of the gdb-patches@sources.redhat.com mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

PATCH Remove extraneous conflict markers from ChangeLog



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 ----

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]