diff options
| author | Joakim Verona | 2012-05-22 08:52:40 +0200 |
|---|---|---|
| committer | Joakim Verona | 2012-05-22 08:52:40 +0200 |
| commit | 207460f292db1b9ede6b8ddad3ed7ac6bba026b5 (patch) | |
| tree | 1940ab855db68a26de26d8d98223be6c4df00df8 /doc | |
| parent | f65ef7eab4132e1de79355660b78878d23038110 (diff) | |
| parent | cb1f695c7355c7b19dd79c8c2aa704a19fcfafa7 (diff) | |
| download | emacs-207460f292db1b9ede6b8ddad3ed7ac6bba026b5.tar.gz emacs-207460f292db1b9ede6b8ddad3ed7ac6bba026b5.zip | |
upstream
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/emacs/emacs.texi | 2 |
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 @@ | |||
| 1 | 2012-05-22 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * emacs.texi (Acknowledgments): Add another contributor. | ||
| 4 | |||
| 1 | 2012-05-12 Glenn Morris <rgm@gnu.org> | 5 | 2012-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 | ||
| 1349 | Contributors to GNU Emacs include Jari Aalto, Per Abrahamsen, Tomas | 1349 | Contributors to GNU Emacs include Jari Aalto, Per Abrahamsen, Tomas |
| 1350 | Abrahamsson, Jay K.@: Adams, Alon Albert, Michael Albinus, Nagy | 1350 | Abrahamsson, Jay K.@: Adams, Alon Albert, Michael Albinus, Nagy |
| 1351 | Andras, Benjamin Andresen, Ralf Angeli, Joe Arceneaux, Emil Åström, | 1351 | Andras, Benjamin Andresen, Ralf Angeli, Dmitry Antipov, Joe Arceneaux, Emil Åström, |
| 1352 | Miles Bader, David Bakhash, Juanma Barranquero, Eli Barzilay, Thomas | 1352 | Miles Bader, David Bakhash, Juanma Barranquero, Eli Barzilay, Thomas |
| 1353 | Baumann, Steven L.@: Baur, Jay Belanger, Alexander L.@: Belikoff, | 1353 | Baumann, Steven L.@: Baur, Jay Belanger, Alexander L.@: Belikoff, |
| 1354 | Thomas Bellman, Scott Bender, Boaz Ben-Zvi, Sergey Berezin, Karl | 1354 | Thomas Bellman, Scott Bender, Boaz Ben-Zvi, Sergey Berezin, Karl |