From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19440 invoked by alias); 18 Jan 2013 21:48:40 -0000 Mailing-List: contact archer-commits-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: Received: (qmail 19382 invoked by uid 9674); 18 Jan 2013 21:48:38 -0000 Date: Fri, 18 Jan 2013 21:48:00 -0000 Message-ID: <20130118214837.19353.qmail@sourceware.org> From: jkratoch@sourceware.org To: archer-commits@sourceware.org Subject: [SCM] archer-jankratochvil-vla: Merge remote-tracking branch 'gdb/master' into archer-jankratochvil-vla X-Git-Refname: refs/heads/archer-jankratochvil-vla X-Git-Reftype: branch X-Git-Oldrev: 0b4bf7253cf51772f64e1c6ad63f81b86693516d X-Git-Newrev: 482696a59bf305c525ea402abb5c343feccb89f5 X-SW-Source: 2013-q1/txt/msg00021.txt.bz2 List-Id: The branch, archer-jankratochvil-vla has been updated via 482696a59bf305c525ea402abb5c343feccb89f5 (commit) via 63080aa88f3919599f953ac7676f653627bd6bbd (commit) via dde8cbb12e785a7f79450548b0e2cb22ad29feb1 (commit) from 0b4bf7253cf51772f64e1c6ad63f81b86693516d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 482696a59bf305c525ea402abb5c343feccb89f5 Merge: 0b4bf72 63080aa Author: Jan Kratochvil Date: Fri Jan 18 22:48:27 2013 +0100 Merge remote-tracking branch 'gdb/master' into archer-jankratochvil-vla ----------------------------------------------------------------------- Summary of changes: gdb/ChangeLog | 3 +++ gdb/MAINTAINERS | 1 + gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/label.c | 2 +- 4 files changed, 10 insertions(+), 1 deletions(-) First 500 lines of diff: diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7fcdf67..bdd879e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,6 @@ +2012-12-12 David Blaikie + + * MAINTAINERS (Write After Approval): Add "David Blaikie". 2013-01-18 Tom Tromey PR c++/14999: diff --git a/gdb/MAINTAINERS b/gdb/MAINTAINERS index 1691623..16ae0ea 100644 --- a/gdb/MAINTAINERS +++ b/gdb/MAINTAINERS @@ -467,6 +467,7 @@ Jon Beniston jon@beniston.com Gary Benson gbenson@redhat.com Jan Beulich jbeulich@novell.com Jim Blandy jimb@codesourcery.com +David Blaikie dblaikie@gmail.com Philip Blundell philb@gnu.org Eric Botcazou ebotcazou@libertysurf.fr Per Bothner per@bothner.com diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 340a132..8b6562b 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-01-18  David Blaikie   + + * gdb.base/label.c (main): Correct the type of the second + parameter. + 2013-01-18 Tom Tromey * gdb.dwarf2/trace-crash.s: New file. diff --git a/gdb/testsuite/gdb.base/label.c b/gdb/testsuite/gdb.base/label.c index f9cd8c3..c15e3bf 100644 --- a/gdb/testsuite/gdb.base/label.c +++ b/gdb/testsuite/gdb.base/label.c @@ -1,7 +1,7 @@ #include int -main (int argc, char *argv) +main (int argc, char **argv) { int i = 0; goto there; hooks/post-receive -- Repository for Project Archer.