aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-04-16 00:43:29 -0700
committerGlenn Morris2010-04-16 00:43:29 -0700
commitd52dbd3d45804baa4645ee14cfe2176e2b6acee3 (patch)
treeb27eddd64adf57b1a374193c42e017a5ecc910e2
parentb1519d856183d8e96bf4623422d8fa70466756a6 (diff)
downloademacs-d52dbd3d45804baa4645ee14cfe2176e2b6acee3.tar.gz
emacs-d52dbd3d45804baa4645ee14cfe2176e2b6acee3.zip
* emacs.texi (Acknowledgments): Remove duplicate.
-rw-r--r--doc/emacs/ChangeLog2
-rw-r--r--doc/emacs/emacs.texi6
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 0665133fae2..8b26fdfb7e5 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,7 @@
12010-04-16 Glenn Morris <rgm@gnu.org> 12010-04-16 Glenn Morris <rgm@gnu.org>
2 2
3 * emacs.texi (Acknowledgments): Remove duplicate.
4
3 * maintaining.texi (VC Directory Commands): Mention stashes and shelves. 5 * maintaining.texi (VC Directory Commands): Mention stashes and shelves.
4 6
52010-04-15 Glenn Morris <rgm@gnu.org> 72010-04-15 Glenn Morris <rgm@gnu.org>
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 383c8f82d90..0e5463828e7 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1403,9 +1403,9 @@ Schnoebelen, Jan Schormann, Alex Schroeder, Stephen Schoef, Raymond
1403Scholz, Eric Schulte, Andreas Schwab, Randal Schwartz, Oliver Seidel, 1403Scholz, Eric Schulte, Andreas Schwab, Randal Schwartz, Oliver Seidel,
1404Manuel Serrano, Hovav Shacham, Stanislav Shalunov, Marc Shapiro, Richard 1404Manuel Serrano, Hovav Shacham, Stanislav Shalunov, Marc Shapiro, Richard
1405Sharman, Olin Shivers, Espen Skoglund, Rick Sladkey, Lynn Slater, Chris 1405Sharman, Olin Shivers, Espen Skoglund, Rick Sladkey, Lynn Slater, Chris
1406Smith, David Smith, Paul D.@: Smith, Andre Spiegel, Michael Staats, 1406Smith, David Smith, Paul D.@: Smith, William Sommerfeld, Andre Spiegel,
1407William Sommerfeld, Michael Staats, Reiner Steib, Sam Steingold, Ake 1407Michael Staats, Reiner Steib, Sam Steingold, Ake Stenhoff,
1408Stenhoff, Peter Stephenson, Ken Stevens, Andy Stewart, Jonathan 1408Peter Stephenson, Ken Stevens, Andy Stewart, Jonathan
1409Stigelman, Martin Stjernholm, Kim F.@: Storm, Steve Strassman, Olaf 1409Stigelman, Martin Stjernholm, Kim F.@: Storm, Steve Strassman, Olaf
1410Sylvester, Naoto Takahashi, Steven Tamm, Jean-Philippe Theberge, Jens 1410Sylvester, Naoto Takahashi, Steven Tamm, Jean-Philippe Theberge, Jens
1411T.@: Berger Thielemann, Spencer Thomas, Jim Thompson, Luc Teirlinck, 1411T.@: Berger Thielemann, Spencer Thomas, Jim Thompson, Luc Teirlinck,