diff options
| author | Paul Eggert | 2011-09-06 09:34:41 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-09-06 09:34:41 -0700 |
| commit | e39b275c8c4abe1e293d4336bb1cb13ad95e5491 (patch) | |
| tree | 22da66c2fe8e7b447e8872b481701bcb4b3e2a3a /admin | |
| parent | 1c262cae409ec55a234c89b3b74a13a77c7f595a (diff) | |
| parent | b2db44d9c6b6895222e9de5ab58b3897fdb3c889 (diff) | |
| download | emacs-e39b275c8c4abe1e293d4336bb1cb13ad95e5491.tar.gz emacs-e39b275c8c4abe1e293d4336bb1cb13ad95e5491.zip | |
Merge from trunk.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 40300fc8dcf..9856f38fabb 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | 2011-09-03 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-09-06 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | Merge from gnulib (Bug#9169). | 3 | Merge from gnulib (Bug#9169). |
| 4 | * notes/copyright: The files compile, config.guess, config.sub, | 4 | * notes/copyright: The files compile, config.guess, config.sub, |