diff options
| author | Paul Eggert | 2012-01-14 22:41:53 -0800 |
|---|---|---|
| committer | Paul Eggert | 2012-01-14 22:41:53 -0800 |
| commit | 807f82fcebc7d946baa23f1d29ff5b0cf336f08e (patch) | |
| tree | fa41cebf5b9c6d3bb6a22517a7002fe3a398588f /admin/ChangeLog | |
| parent | 35cf62d95cdcd5323dcea4a5385942c342ff1d9c (diff) | |
| parent | 861df977526140af8147bef4950e8863655c203d (diff) | |
| download | emacs-807f82fcebc7d946baa23f1d29ff5b0cf336f08e.tar.gz emacs-807f82fcebc7d946baa23f1d29ff5b0cf336f08e.zip | |
Merge from trunk.
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 3bfbab881aa..597beb60ce2 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-01-14 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * FOR-RELEASE (Check the Emacs Tutorial): Mark TUTORIAL.he as | ||
| 4 | updated and checked. | ||
| 5 | |||
| 1 | 2011-11-26 Andreas Schwab <schwab@linux-m68k.org> | 6 | 2011-11-26 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 7 | ||
| 3 | * grammars/bovine-grammar.el (bovine--grammar-newstyle-unquote): | 8 | * grammars/bovine-grammar.el (bovine--grammar-newstyle-unquote): |