diff options
| author | Paul Eggert | 2012-01-09 09:36:10 -0800 |
|---|---|---|
| committer | Paul Eggert | 2012-01-09 09:36:10 -0800 |
| commit | 35cf62d95cdcd5323dcea4a5385942c342ff1d9c (patch) | |
| tree | 90358cbb033a126c4d48793a80fd804b7baaca24 /admin/ChangeLog | |
| parent | 59815c02506eb39b61e672528ed03885749ba529 (diff) | |
| parent | 7655cb66d86564e792b825f1a0e1a4de7d6e6db5 (diff) | |
| download | emacs-35cf62d95cdcd5323dcea4a5385942c342ff1d9c.tar.gz emacs-35cf62d95cdcd5323dcea4a5385942c342ff1d9c.zip | |
Merge from trunk.
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 4da85943b7f..3bfbab881aa 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1226,7 +1226,7 @@ | |||
| 1226 | ;; coding: utf-8 | 1226 | ;; coding: utf-8 |
| 1227 | ;; End: | 1227 | ;; End: |
| 1228 | 1228 | ||
| 1229 | Copyright (C) 2001-2011 Free Software Foundation, Inc. | 1229 | Copyright (C) 2001-2012 Free Software Foundation, Inc. |
| 1230 | 1230 | ||
| 1231 | This file is part of GNU Emacs. | 1231 | This file is part of GNU Emacs. |
| 1232 | 1232 | ||