diff options
| author | Juanma Barranquero | 2014-04-19 01:36:51 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2014-04-19 01:36:51 +0200 |
| commit | bba633792b813249a47dde828cbf84cdb946ba60 (patch) | |
| tree | e320e5217ad3dc878e49fb86be7297a5cef60e5f /admin/ChangeLog | |
| parent | f0496348d1b9b1f2fff9e4265f51cbdc77eb40dc (diff) | |
| parent | 2a2e6726d1f7031d89fd6740e5b167476267f778 (diff) | |
| download | emacs-bba633792b813249a47dde828cbf84cdb946ba60.tar.gz emacs-bba633792b813249a47dde828cbf84cdb946ba60.zip | |
Merge from emacs-24; up to 2014-04-16T15:28:06Z!eggert@cs.ucla.edu
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index c28ff6853c2..7af23b779ef 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-04-18 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * notes/bzr: Update instructions for merging from gnulib. | ||
| 4 | Remove obsolete note about tramp.el and tramp-sh.el. | ||
| 5 | Change "emacs-23" to "emacs-24". | ||
| 6 | |||
| 1 | 2014-04-11 Glenn Morris <rgm@gnu.org> | 7 | 2014-04-11 Glenn Morris <rgm@gnu.org> |
| 2 | 8 | ||
| 3 | * grammars/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport. | 9 | * grammars/Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport. |