Mercurial > emacs
diff ChangeLog @ 106931:fc97b35886c9
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Wed, 13 Jan 2010 09:37:38 +0000 |
parents | 1d1d5d9bd884 |
children | d189e0755f30 |
line wrap: on
line diff
--- a/ChangeLog Tue Jan 12 23:43:15 2010 +0000 +++ b/ChangeLog Wed Jan 13 09:37:38 2010 +0000 @@ -1,3 +1,7 @@ +2010-01-12 Juanma Barranquero <lekktu@gmail.com> + + * .bzrignore: Ignore all .exe, instead of individual files. + 2010-01-12 Chong Yidong <cyd@stupidchicken.com> * configure.in: Explicitly check for and link to -lXrender. @@ -7839,7 +7843,7 @@ ;; End: Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, - 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs.