darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove stray CVS conflict marker.

Browse source
This commit is contained in:
Mark Kettenis 2004-06-26 11:49:19 +00:00
parent cb4610693d
commit 35819f5e08
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gdb/ChangeLog
View file

@ -243,7 +243,6 @@
* cli/cli-cmds.c (disassemble_command): Update. * cli/cli-cmds.c (disassemble_command): Update.
* vax-tdep.c (vax_gdbarch_init): Update. * vax-tdep.c (vax_gdbarch_init): Update.
>>>>>>> 1.6028
2004-06-18 Mark Kettenis <kettenis@gnu.org> 2004-06-18 Mark Kettenis <kettenis@gnu.org>
* i386-tdep.c (i386_collect_fpregset): Fix comment. * i386-tdep.c (i386_collect_fpregset): Fix comment.