Updated gdb/Changelog:

* MAINTAINERS (Write After Approval): Add "Mike Wrighton".

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index abe259387442fb7c1b6fcadd02f7ccf642c25605..31ff310d22d53f63c009eb1d40ec1edc2e37c59b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-17  Mike Wrighton  <wrighton@codesourcery.com>
+
+       * MAINTAINERS (Write After Approval): Add "Mike Wrighton".
+
 2012-09-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        * common/linux-ptrace.c: Change __i386__ to __i386__ || __x86_64__.
@@ -175,6 +179,7 @@
        (DECLARE_REGISTRY): Declare struct TAG ## _data.  Use the tagged
        callback typedefs.
 
+>>>>>>> 1.14670
 2012-09-12  Doug Evans  <dje@google.com>
 
        * dwarf2read.c (dwarf2_read_addr_index): Fix handling the case where