diff options
| author | Paul Pluzhnikov <ppluzhnikov@google.com> | 2009-03-31 22:39:27 +0000 |
|---|---|---|
| committer | Paul Pluzhnikov <ppluzhnikov@google.com> | 2009-03-31 22:39:27 +0000 |
| commit | 1b88d5c487d0f28d15eb9d61dc752cfb1b609125 (patch) | |
| tree | 257ac0d8ed6604d4af682e6d41b601ac9eb9d1d5 /gdb | |
| parent | f47a1d2eb8ec6e792466dca865b3c3450e7a8e88 (diff) | |
| download | gdb-1b88d5c487d0f28d15eb9d61dc752cfb1b609125.zip gdb-1b88d5c487d0f28d15eb9d61dc752cfb1b609125.tar.gz gdb-1b88d5c487d0f28d15eb9d61dc752cfb1b609125.tar.bz2 | |
[obvious] Kill left-over merge marker
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1ff05ab..c9ba8b2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1041,7 +1041,6 @@ RETVAL_EXPR for UNOP_CAST and set RETURN_TYPE to the RETURN_VALUE type if RETURN_TYPE is NULL. ->>>>>>> 1.10280 2009-03-14 Pedro Alves <pedro@codesourcery.com> * remote.c (PACKET_qAttached): New. |