diff ChangeLog @ 107617:c5f9e4613394

Merge from mainline.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 16 Jan 2010 06:57:09 -0500
parents 1d1d5d9bd884
children d189e0755f30
line wrap: on
line diff
--- a/ChangeLog	Sat Jan 09 11:27:11 2010 -0500
+++ b/ChangeLog	Sat Jan 16 06:57:09 2010 -0500
@@ -1,3 +1,16 @@
+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.
+
+2010-01-12  Glenn Morris  <rgm@gnu.org>
+
+	* INSTALL.BZR, README: Use bug-gnu-emacs rather than emacs-pretest-bug
+	for bug reports for development versions.
+
 2010-01-02  Eli Zaretskii  <eliz@gnu.org>
 
 	* .bzrignore: Add more ignored patterns, including for the MS-DOS
@@ -7830,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.