From 0fa6bd39ee7c4d33af4006fae32377f0ecfd068b Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Mon, 5 Apr 2010 18:02:22 +0000 Subject: [PATCH] merge from gcc --- intl/ChangeLog | 4 ++++ intl/aclocal.m4 | 2 +- libdecnumber/ChangeLog | 4 ++++ libdecnumber/aclocal.m4 | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/intl/ChangeLog b/intl/ChangeLog index 20aaed376b0..8460b3d554d 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,3 +1,7 @@ +2010-04-02 Ralf Wildenhues + + * aclocal.m4: Regenerate. + 2009-10-15 Jim Blandy * libgnuintl.h (_INTL_MAY_RETURN_STRING_ARG, gettext, dgettext) diff --git a/intl/aclocal.m4 b/intl/aclocal.m4 index fbc70f86d8b..7bbc56a3959 100644 --- a/intl/aclocal.m4 +++ b/intl/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. diff --git a/libdecnumber/ChangeLog b/libdecnumber/ChangeLog index b218e422918..a0c2953945c 100644 --- a/libdecnumber/ChangeLog +++ b/libdecnumber/ChangeLog @@ -1,3 +1,7 @@ +2010-04-02 Ralf Wildenhues + + * aclocal.m4: Regenerate. + 2010-01-05 Rainer Orth * configure: Regenerate. diff --git a/libdecnumber/aclocal.m4 b/libdecnumber/aclocal.m4 index ee8529730a6..7dc0312687f 100644 --- a/libdecnumber/aclocal.m4 +++ b/libdecnumber/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -- 2.30.2