From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 31 Jan 2011 08:15:13 +0000 (-0800)
Subject: Merge: src/emacs.c now gets version number from configure.in
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~57
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3df3a1fc82ba4116b5eb6a4726058095ab6e450b;p=emacs.git

Merge: src/emacs.c now gets version number from configure.in
---

3df3a1fc82ba4116b5eb6a4726058095ab6e450b
diff --cc src/ChangeLog
index 63ea7c29bf4,5a3c34dcc2d..f96fe5eb2f8
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,9 +1,14 @@@
+ 2011-01-31  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+ 	src/emacs.c now gets version number from configure.in
+ 	* emacs.c (emacs_version): Set to VERSION so that it
+ 	is determined automatically from ../configure.in.
+ 
 +2011-01-31  Jim Meyering  <meyering@redhat.com>
 +
 +	* charset.c (load_charset_map): Don't deref NULL on failed malloc.
 +	Use xmalloc rather than malloc.
 +
  2011-01-30  Paul Eggert  <eggert@cs.ucla.edu>
  
  	strftime: import from gnulib