OSDN Git Service
(root)
/
pf3gnuchains
/
pf3gnuchains4x.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
39b96f4
)
Remove stray CVS conflict marker.
author
Mark Kettenis
<kettenis@gnu.org>
Sat, 26 Jun 2004 11:49:19 +0000
(11:49 +0000)
committer
Mark Kettenis
<kettenis@gnu.org>
Sat, 26 Jun 2004 11:49:19 +0000
(11:49 +0000)
gdb/ChangeLog
patch
|
blob
|
history
diff --git
a/gdb/ChangeLog
b/gdb/ChangeLog
index
3600061
..
f366816
100644
(file)
--- a/
gdb/ChangeLog
+++ b/
gdb/ChangeLog
@@
-243,7
+243,6
@@
* cli/cli-cmds.c (disassemble_command): Update.
* vax-tdep.c (vax_gdbarch_init): Update.
->>>>>>> 1.6028
2004-06-18 Mark Kettenis <kettenis@gnu.org>
* i386-tdep.c (i386_collect_fpregset): Fix comment.