aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-05-21 20:35:14 -0700
committerGlenn Morris2012-05-21 20:35:14 -0700
commit6c200b4ac55f0dffe8b13b881ae0c65e0557bbea (patch)
tree34da741293099e04566be3420c9c5ea4386e5f44
parent3290526dde9b633b7a032de36fd961347f1bfe88 (diff)
downloademacs-6c200b4ac55f0dffe8b13b881ae0c65e0557bbea.tar.gz
emacs-6c200b4ac55f0dffe8b13b881ae0c65e0557bbea.zip
* doc/emacs/emacs.texi (Acknowledgments): Add another contributor.
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/emacs.texi2
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index a9d45ef2a4c..e944e161494 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
12012-05-22 Glenn Morris <rgm@gnu.org>
2
3 * emacs.texi (Acknowledgments): Add another contributor.
4
12012-05-12 Glenn Morris <rgm@gnu.org> 52012-05-12 Glenn Morris <rgm@gnu.org>
2 6
3 * Makefile.in (MKDIR_P): New, set by configure. 7 * Makefile.in (MKDIR_P): New, set by configure.
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 9042f84e3b6..ceb0b4a52d5 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1348,7 +1348,7 @@ USA
1348 1348
1349Contributors to GNU Emacs include Jari Aalto, Per Abrahamsen, Tomas 1349Contributors to GNU Emacs include Jari Aalto, Per Abrahamsen, Tomas
1350Abrahamsson, Jay K.@: Adams, Alon Albert, Michael Albinus, Nagy 1350Abrahamsson, Jay K.@: Adams, Alon Albert, Michael Albinus, Nagy
1351Andras, Benjamin Andresen, Ralf Angeli, Joe Arceneaux, Emil Åström, 1351Andras, Benjamin Andresen, Ralf Angeli, Dmitry Antipov, Joe Arceneaux, Emil Åström,
1352Miles Bader, David Bakhash, Juanma Barranquero, Eli Barzilay, Thomas 1352Miles Bader, David Bakhash, Juanma Barranquero, Eli Barzilay, Thomas
1353Baumann, Steven L.@: Baur, Jay Belanger, Alexander L.@: Belikoff, 1353Baumann, Steven L.@: Baur, Jay Belanger, Alexander L.@: Belikoff,
1354Thomas Bellman, Scott Bender, Boaz Ben-Zvi, Sergey Berezin, Karl 1354Thomas Bellman, Scott Bender, Boaz Ben-Zvi, Sergey Berezin, Karl