diff ChangeLog @ 108758:2903660f846b

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Mon, 24 May 2010 22:47:09 +0000
parents f7bbe35cec23
children a8af6d66bbd0
line wrap: on
line diff
--- a/ChangeLog	Sun May 23 23:03:20 2010 +0000
+++ b/ChangeLog	Mon May 24 22:47:09 2010 +0000
@@ -1,3 +1,8 @@
+2010-05-24  Romain Francoise  <romain@orebokech.com>
+
+	* make-dist: Look for version in src/emacs.c.
+	Use lisp/subr.el rather than lisp/version.el for location check.
+
 2010-05-21  Glenn Morris  <rgm@gnu.org>
 
 	* configure.in (MKDEPDIR): Parallel build tweak.