diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-02-10 20:43:55 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-02-10 20:43:55 +0000 |
| commit | bdfec2134d38a605c95baab0e38ef321a6b1d59e (patch) | |
| tree | f2c616c523590a8a8f294ea3c6258d72f5de86a1 /lisp/version.el | |
| parent | fc8bcb58bc6e96beed7ad20bae40d28d3d2ea058 (diff) | |
| parent | d25e21dddcd4df58a4029f106ad7eea82c5726dd (diff) | |
| download | emacs-bdfec2134d38a605c95baab0e38ef321a6b1d59e.tar.gz | |
Merged from miles@gnu.org--gnu-2005 (patch 12-13, 79-90)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-79
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-80
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-81
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-82
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-83
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-84
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-85
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-86
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-87
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-88
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-89
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-90
Update from CVS: man/calc.texi: Add macro for LaTeX for info output.
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-12
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-13
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-290
Diffstat (limited to 'lisp/version.el')
| -rw-r--r-- | lisp/version.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/version.el b/lisp/version.el index 9cae0d25702..07d59c76dd8 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -27,7 +27,7 @@ ;;; Code: -(defconst emacs-version "21.3.50" "\ +(defconst emacs-version "22.0.50" "\ Version numbers of this version of Emacs.") (defconst emacs-major-version |