diff options
| author | Paul Eggert | 2011-07-25 09:26:30 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-07-25 09:26:30 -0700 |
| commit | ea8db5520cb3d1aa7c682cbcd22f80e7a9188169 (patch) | |
| tree | 3e24b36136cd3b3c1b7f5d60a011997f98364e29 /admin | |
| parent | ccd80c5525ba298b055e43f83830e9090b9b1887 (diff) | |
| parent | 2238127283d703f38765f9b3f6a64f799d18e9e5 (diff) | |
| download | emacs-ea8db5520cb3d1aa7c682cbcd22f80e7a9188169.tar.gz emacs-ea8db5520cb3d1aa7c682cbcd22f80e7a9188169.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 8b0ed10cb3b..c934a3c1b57 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | 2011-07-24 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-07-25 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | Merge from gnulib. | 3 | Merge from gnulib. |
| 4 | * notes/copyright: The files compile, config.guess, config.sub, | 4 | * notes/copyright: The files compile, config.guess, config.sub, |