diff options
| author | Vladimir Prus <vladimir@codesourcery.com> | 2010-03-23 21:34:30 +0000 |
|---|---|---|
| committer | Vladimir Prus <vladimir@codesourcery.com> | 2010-03-23 21:34:30 +0000 |
| commit | 58ddf7c9cd631e783da62b342e03b9781933fe3c (patch) | |
| tree | 5095edc06c441e0bb7954b169ef25eefe69a8ada | |
| parent | a7bdde9e633ffde58462e01bdfb0d1ee9a642d7c (diff) | |
| download | gdb-58ddf7c9cd631e783da62b342e03b9781933fe3c.zip gdb-58ddf7c9cd631e783da62b342e03b9781933fe3c.tar.gz gdb-58ddf7c9cd631e783da62b342e03b9781933fe3c.tar.bz2 | |
Remove conflict marker.
| -rw-r--r-- | gdb/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1d67755..f801b41 100644 --- 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)/.. |