diff options
| author | Kenichi Handa | 2011-09-27 11:18:32 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2011-09-27 11:18:32 +0900 |
| commit | 9aa99d0176c2021194f38eb27668395cd242395f (patch) | |
| tree | 7a297fd59f2f77833e94d3b0f8ce84d89d3f413c /admin/ChangeLog | |
| parent | dd7aa8dd07c456d5519194c279a808213b63cb3d (diff) | |
| parent | d594cb6163558c29797f8fc6939666574ea4a617 (diff) | |
| download | emacs-9aa99d0176c2021194f38eb27668395cd242395f.tar.gz emacs-9aa99d0176c2021194f38eb27668395cd242395f.zip | |
merge 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). |