From f74ba48723595cae2d9dfbc7d9562adecd8a1c6c Mon Sep 17 00:00:00 2001
From: wrighton <wrighton>
Date: Mon, 17 Sep 2012 19:16:48 +0000
Subject: Updated gdb/Changelog:

* MAINTAINERS (Write After Approval): Add "Mike Wrighton".
---
 gdb/ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index abe25938744..31ff310d22d 100644
--- 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
-- 
cgit v1.2.1