diff options
| author | Kenichi Handa | 2012-01-21 20:36:42 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-01-21 20:36:42 +0900 |
| commit | 678fb7066698ebfe3aecba722294025ed26da01b (patch) | |
| tree | 951ac3055141d950974051d13c10e5d7c6a98e31 /src/ChangeLog.3 | |
| parent | 71784361eb381ec2b12bd8283724a7addec49079 (diff) | |
| parent | 959ad23fb9020a121c4520946835e9f0aeb9bcb2 (diff) | |
| download | emacs-678fb7066698ebfe3aecba722294025ed26da01b.tar.gz emacs-678fb7066698ebfe3aecba722294025ed26da01b.zip | |
merge trunk
Diffstat (limited to 'src/ChangeLog.3')
| -rw-r--r-- | src/ChangeLog.3 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3 index 34906e505da..6c580fe4b52 100644 --- a/src/ChangeLog.3 +++ b/src/ChangeLog.3 | |||
| @@ -16507,7 +16507,7 @@ See ChangeLog.2 for earlier changes. | |||
| 16507 | ;; coding: utf-8 | 16507 | ;; coding: utf-8 |
| 16508 | ;; End: | 16508 | ;; End: |
| 16509 | 16509 | ||
| 16510 | Copyright (C) 1993, 2001-2011 Free Software Foundation, Inc. | 16510 | Copyright (C) 1993, 2001-2012 Free Software Foundation, Inc. |
| 16511 | 16511 | ||
| 16512 | This file is part of GNU Emacs. | 16512 | This file is part of GNU Emacs. |
| 16513 | 16513 | ||