Mercurial > emacs
diff ChangeLog @ 112330:56d3e9c28eb0
Merge from mainline.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Mon, 17 Jan 2011 11:01:01 -0800 |
| parents | ba9f26694b92 87a2c7d05f19 |
| children | f6578f2bd119 |
line wrap: on
line diff
--- a/ChangeLog Sun Jan 16 18:35:15 2011 -0800 +++ b/ChangeLog Mon Jan 17 11:01:01 2011 -0800 @@ -1,4 +1,4 @@ -2011-01-14 Paul Eggert <eggert@cs.ucla.edu> +2011-01-17 Paul Eggert <eggert@cs.ucla.edu> * Makefile.in (GNULIB_MODULES): Change ftoastr to dtoastr. This avoids building ftoastr and ldtoastr, which aren't needed. See @@ -104,6 +104,14 @@ * make-dist: Also put into the distribution aclocal.m4, compile, depcomp, missing, and the files under lib/. +2011-01-15 Glenn Morris <rgm@gnu.org> + + * Makefile.in (epaths-force): No more arch-tag to edit. + +2011-01-15 Chong Yidong <cyd@stupidchicken.com> + + * configure.in: Bump min libxml2 version to 2.6.17 (Bug#7603). + 2011-01-14 Paul Eggert <eggert@cs.ucla.edu> * make-dist: Distribute test/ files too. @@ -8813,8 +8821,9 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, - 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, + 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + Free Software Foundation, Inc. This file is part of GNU Emacs.