projects / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a7bdde9)
Remove conflict marker.
authorVladimir Prus <vladimir@codesourcery.com>
Tue, 23 Mar 2010 21:34:30 +0000 (21:34 +0000)
committerVladimir Prus <vladimir@codesourcery.com>
Tue, 23 Mar 2010 21:34:30 +0000 (21:34 +0000)
gdb/ChangeLog patch | blob | history

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1d677550874deef50429deadd4027259c967cfde..f801b41e2bec09bad7f80ce1942c1e42d5473a4d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -39,7 +39,6 @@
        * mi/mi-cmd-break (mi_cmd_break_commands): Validate commands if
        it's tracepoint.
 
-=======
 2010-03-23  Mike Frysinger  <vapier@gentoo.org>
 
        * Makefile.in (OPCODES_CFLAGS): Add -I$(OPCODES_SRC)/..