diff options
| author | Paul Eggert | 2011-08-02 22:05:38 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-08-02 22:05:38 -0700 |
| commit | 9a70f03d70e44db2ec9c6d2952cb8a1deae15000 (patch) | |
| tree | c0efd5c0a208640c0a883f4566df1b40caa3aaad /etc/ChangeLog | |
| parent | 29c8a348c5c9f326af54a3d30f69cde98fe300bb (diff) | |
| download | emacs-9a70f03d70e44db2ec9c6d2952cb8a1deae15000.tar.gz emacs-9a70f03d70e44db2ec9c6d2952cb8a1deae15000.zip | |
Merge from trunk.
Diffstat (limited to 'etc/ChangeLog')
| -rw-r--r-- | etc/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index e54e8d81b8a..6d89746ed05 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-07-30 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * grammars: New directory. | ||
| 4 | |||
| 1 | 2011-07-28 Andreas Schwab <schwab@linux-m68k.org> | 5 | 2011-07-28 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 6 | ||
| 3 | * NEWS: Document ## and #:. | 7 | * NEWS: Document ## and #:. |