diff options
| author | Stefan Monnier | 2010-03-24 14:02:56 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2010-03-24 14:02:56 -0400 |
| commit | e867cb5d30200dd696b012e1ad0964d25c2a7ecc (patch) | |
| tree | 3340026420f168909eaa734232e4890e15bc1626 /doc/misc | |
| parent | b2b8574b8d03673f5673e2154d17c2cb80f59a0b (diff) | |
| parent | efee6a6d9cec2af824b8355c93d8f47b72a685a8 (diff) | |
| download | emacs-e867cb5d30200dd696b012e1ad0964d25c2a7ecc.tar.gz emacs-e867cb5d30200dd696b012e1ad0964d25c2a7ecc.zip | |
Merge from `emacs-23'.
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/misc/trampver.texi | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 136a1eea0fb..1204e757771 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-03-24 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * trampver.texi: Update release number. | ||
| 4 | |||
| 1 | 2010-03-10 Chong Yidong <cyd@stupidchicken.com> | 5 | 2010-03-10 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * Branch for 23.2. | 7 | * Branch for 23.2. |
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi index 8456a1e0d11..c8608edf6b6 100644 --- a/doc/misc/trampver.texi +++ b/doc/misc/trampver.texi | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | @c In the Tramp CVS, the version number is auto-frobbed from | 9 | @c In the Tramp CVS, the version number is auto-frobbed from |
| 10 | @c configure.ac, so you should edit that file and run | 10 | @c configure.ac, so you should edit that file and run |
| 11 | @c "autoconf && ./configure" to change the version number. | 11 | @c "autoconf && ./configure" to change the version number. |
| 12 | @set trampver 2.1.18-pre | 12 | @set trampver 2.1.18-23.2 |
| 13 | 13 | ||
| 14 | @c Other flags from configuration | 14 | @c Other flags from configuration |
| 15 | @set instprefix /usr/local | 15 | @set instprefix /usr/local |