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

Remove CVS merge markers.

This commit is contained in:
Ian Lance Taylor 1994-01-12 19:18:56 +00:00
parent bbf7e43ddc
commit 4a99cebf62
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gas/ChangeLog
View File

@ -47,7 +47,6 @@ Tue Jan 11 13:01:20 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com)
emitting nop instructions.
* Makefile.in (listing.o): Depends upon subsegs.h.
>>>>>>> 1.484
Mon Jan 10 09:52:23 1994 Jeffrey A. Law (law@snake.cs.utah.edu)
* config/tc-hppa.c (pa_ip): Put check for missing label on .PROC