Re: [commit] Hardware breakpoint errors patch, gdb/MAINTAINERS

Tom Tromey
2012-09-17T20:54:02Z

>>>>> "Mike" == Mike Wrighton <mike_wrighton@mentor.com> writes:

Mike> I've committed the following patches to fix the hardware breakpoint
Mike> errors bug and add myself to the gdb/MAINTAINERS list (I had to
Mike> correct an error in the gdb/Changelog entry hence 2 patches for that
Mike> file).

Mike> diff -u -r1.14670 -r1.14671
Mike> --- src/gdb/ChangeLog 2012/09/17 18:27:57 1.14670
Mike> +++ src/gdb/ChangeLog 2012/09/17 19:16:48 1.14671
[...]
Mike> +>>>>>>> 1.14670

Forgotten conflict marker.

Tom