aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kifer2008-11-16 05:18:36 +0000
committerMichael Kifer2008-11-16 05:18:36 +0000
commit837afb4a09f1aebf3dce3d2ad4d1a57a4ca59f38 (patch)
treeaf5f9728e46a1e7e10da3222dda73f935c611831
parent2dc754bc781256274b2e079ca40f94d05cfe30fc (diff)
downloademacs-837afb4a09f1aebf3dce3d2ad4d1a57a4ca59f38.tar.gz
emacs-837afb4a09f1aebf3dce3d2ad4d1a57a4ca59f38.zip
version timestamp update
-rw-r--r--doc/misc/ChangeLog2
-rw-r--r--doc/misc/ediff.texi5
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 6485f7bd6c6..52a1cf46da0 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,6 +1,8 @@
12008-16-06 Michael Kifer <kifer@cs.stonybrook.edu> 12008-16-06 Michael Kifer <kifer@cs.stonybrook.edu>
2 2
3 * viper.texi (viper-ESC-keyseq-timeout, viper-ESC-key): Removed. 3 * viper.texi (viper-ESC-keyseq-timeout, viper-ESC-key): Removed.
4
5 * ediff.texi: version/date change.
4 6
52008-11-14 Chong Yidong <cyd@stupidchicken.com> 72008-11-14 Chong Yidong <cyd@stupidchicken.com>
6 8
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index 0cd4c547242..17c6852fea5 100644
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -50,9 +50,9 @@ developing GNU and promoting software freedom.''
50@titlepage 50@titlepage
51@title Ediff User's Manual 51@title Ediff User's Manual
52@sp 4 52@sp 4
53@subtitle Ediff version 2.81.1 53@subtitle Ediff version 2.81.2
54@sp 1 54@sp 1
55@subtitle April 2007 55@subtitle November 2008
56@sp 5 56@sp 5
57@author Michael Kifer 57@author Michael Kifer
58@page 58@page
@@ -2501,6 +2501,7 @@ Andy Scott (ascott@@pcocd2.intel.com),
2501Axel Seibert (axel@@tumbolia.ppp.informatik.uni-muenchen.de), 2501Axel Seibert (axel@@tumbolia.ppp.informatik.uni-muenchen.de),
2502Vin Shelton (acs@@xemacs.org), 2502Vin Shelton (acs@@xemacs.org),
2503Scott O. Sherman (Scott.Sherman@@mci.com), 2503Scott O. Sherman (Scott.Sherman@@mci.com),
2504Nikolaj Schumacher (n_schumacher@@web.de),
2504Richard Stallman (rms@@gnu.org), 2505Richard Stallman (rms@@gnu.org),
2505Richard Stanton (stanton@@haas.berkeley.edu), 2506Richard Stanton (stanton@@haas.berkeley.edu),
2506Sam Steingold (sds@@goems.com), 2507Sam Steingold (sds@@goems.com),