diff options
| author | Ian Lance Taylor <ian@airs.com> | 1994-01-12 19:18:56 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 1994-01-12 19:18:56 +0000 |
| commit | 4a99cebf627de8b6e0cf5eff68ea53a3369bdc4f (patch) | |
| tree | 29ebff203e7f5635cb5b2a78f34828d50dbb6721 /gas | |
| parent | bbf7e43ddc09ba131142e1da938edc87b65eee36 (diff) | |
| download | gdb-4a99cebf627de8b6e0cf5eff68ea53a3369bdc4f.zip gdb-4a99cebf627de8b6e0cf5eff68ea53a3369bdc4f.tar.gz gdb-4a99cebf627de8b6e0cf5eff68ea53a3369bdc4f.tar.bz2 | |
Remove CVS merge markers.
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 21241f3..781a204 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -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 |