Mercurial > emacs

diff lisp/version.el @ 108340:486e3cc1b3a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Tue, 20 Apr 2010 22:41:29 +0000
parents c3a1d1b47790
children d4caa51ddfe2
line wrap: on
line diff
--- a/lisp/version.el	Mon Apr 19 22:42:15 2010 +0000
+++ b/lisp/version.el	Tue Apr 20 22:41:29 2010 +0000
@@ -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.95" "\
+(defconst emacs-version "23.1.96" "\
 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))) "\