diff options
| author | Paul Eggert | 2011-09-25 22:52:31 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-09-25 22:52:31 -0700 |
| commit | 8de9005d3cc8c605efa5a1eb9bef728a09dbde24 (patch) | |
| tree | 5b2551e7f2c7cd5bd2b3bdd31086ea2ad1ecdb3d /admin/ChangeLog | |
| parent | 856bbc8152110a354293411eac5c629da9f4f74f (diff) | |
| parent | ab22a8a19695ddbb5c5d08cfe4f60e7202072d82 (diff) | |
| download | emacs-8de9005d3cc8c605efa5a1eb9bef728a09dbde24.tar.gz emacs-8de9005d3cc8c605efa5a1eb9bef728a09dbde24.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 9856f38fabb..7648b2a8455 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-09-26 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * admin.el (set-version): Fix regexps for config.nt and | ||
| 4 | sed2v2.inp. | ||
| 5 | |||
| 1 | 2011-09-06 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2011-09-06 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | Merge from gnulib (Bug#9169). | 8 | Merge from gnulib (Bug#9169). |