aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorEli Zaretskii2014-09-29 22:49:44 +0300
committerEli Zaretskii2014-09-29 22:49:44 +0300
commit2b3d968a02be2b8859cc2078904a184337654898 (patch)
tree48e6c0e6b169d252dd0d1ba67e0da2643ef8b12a /etc
parentcbdc06f3be1fb1921454d15d5d9f48bef85cba9e (diff)
downloademacs-2b3d968a02be2b8859cc2078904a184337654898.tar.gz
emacs-2b3d968a02be2b8859cc2078904a184337654898.zip
Follow-up to renaming v24.5 to 25.1.
README: Bump version to 25.0.50. configure.ac (AC_INIT): Bump version to 25.0.50. nt/makefile.w32-in (VERSION): Bump version to 25.0.50. nt/emacsclient.rc: Bump version to 25.0.50. nt/emacs.rc: Bump version to 25.0.50. nt/config.nt (VERSION): Bump version to 25.0.50. msdos/sed2v2.inp: Bump version to 25.0.50. etc/refcards/ru-refcard.tex: Bump version to 25.0.50. etc/refcards/emacsver.tex: Bump version to 25.0.50. src/msdos.c (internal_terminal_init): Bump version to 25. doc/man/emacs.1: Bump version to 25.0.50. doc/emacs/emacsver.texi (EMACSVER): Bump to 20.0.50.
Diffstat (limited to 'etc')
-rw-r--r--etc/ChangeLog6
-rw-r--r--etc/refcards/emacsver.tex2
-rw-r--r--etc/refcards/ru-refcard.tex2
3 files changed, 8 insertions, 2 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index a57605be64d..d87964b6bd2 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,9 @@
12014-09-29 Eli Zaretskii <eliz@gnu.org>
2
3 * refcards/ru-refcard.tex: Bump version to 25.0.50.
4
5 * refcards/emacsver.tex: Bump version to 25.0.50.
6
12014-09-14 Daniel Colascione <dancol@dancol.org> 72014-09-14 Daniel Colascione <dancol@dancol.org>
2 8
3 * NEWS: Mention changes to `insert-register' 9 * NEWS: Mention changes to `insert-register'
diff --git a/etc/refcards/emacsver.tex b/etc/refcards/emacsver.tex
index b2df1970ca3..7e5ff6488dc 100644
--- a/etc/refcards/emacsver.tex
+++ b/etc/refcards/emacsver.tex
@@ -1,4 +1,4 @@
1%% This file is not generated by configure, because then the provided 1%% This file is not generated by configure, because then the provided
2%% pdf files would always appear out-of-date. 2%% pdf files would always appear out-of-date.
3\def\versionemacs{24} % major version of emacs 3\def\versionemacs{25} % major version of emacs
4\def\year{2014} % latest copyright year 4\def\year{2014} % latest copyright year
diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex
index 39a789d1d59..0458ccba41f 100644
--- a/etc/refcards/ru-refcard.tex
+++ b/etc/refcards/ru-refcard.tex
@@ -21,7 +21,7 @@
21\newlength{\ColThreeWidth} 21\newlength{\ColThreeWidth}
22\setlength{\ColThreeWidth}{25mm} 22\setlength{\ColThreeWidth}{25mm}
23 23
24\newcommand{\versionemacs}[0]{24} % version of Emacs this is for 24\newcommand{\versionemacs}[0]{25} % version of Emacs this is for
25\newcommand{\cyear}[0]{2014} % copyright year 25\newcommand{\cyear}[0]{2014} % copyright year
26 26
27\newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill 27\newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill