diff options
| author | Paul Eggert | 2011-01-14 10:14:17 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-14 10:14:17 -0800 |
| commit | 8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d (patch) | |
| tree | 9aed5489fdfdcf75087bf3d8e50e4f5952c8566c /src/ChangeLog | |
| parent | 3720fa2b1ac94b8ac9f193264bcf36990a5f43d2 (diff) | |
| parent | f80aa5bfa90dff5cd75d1f40e4ababa3c86af7fb (diff) | |
| download | emacs-8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d.tar.gz emacs-8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d.zip | |
Merge from mainline.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b68c375b4a6..2265f12138e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -29539,8 +29539,7 @@ See ChangeLog.10 for earlier changes. | |||
| 29539 | ;; coding: utf-8 | 29539 | ;; coding: utf-8 |
| 29540 | ;; End: | 29540 | ;; End: |
| 29541 | 29541 | ||
| 29542 | Copyright (C) 2007, 2008, 2009, 2010, 2011 | 29542 | Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 29543 | Free Software Foundation, Inc. | ||
| 29544 | 29543 | ||
| 29545 | This file is part of GNU Emacs. | 29544 | This file is part of GNU Emacs. |
| 29546 | 29545 | ||