Mercurial > emacs
diff lisp/version.el @ 108492:ac3917b1de28
merge trunk
author | Kenichi Handa <handa@etlken> |
---|---|
date | Mon, 10 May 2010 13:14:21 +0900 |
parents | 22f58204116d |
children | da3121d12212 |
line wrap: on
line diff
--- a/lisp/version.el Fri Apr 23 21:29:11 2010 +0900 +++ b/lisp/version.el Mon May 10 13:14:21 2010 +0900 @@ -32,7 +32,7 @@ (defconst emacs-copyright "Copyright (C) 2010 Free Software Foundation, Inc." "\ Short copyright string for this version of Emacs.") -(defconst emacs-version "23.1.96" "\ +(defconst emacs-version "23.2.50" "\ Version numbers of this version of Emacs.") (defconst emacs-major-version (progn (string-match "^[0-9]+" emacs-version) (string-to-number (match-string 0 emacs-version))) "\