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.6 | |
| parent | 71784361eb381ec2b12bd8283724a7addec49079 (diff) | |
| parent | 959ad23fb9020a121c4520946835e9f0aeb9bcb2 (diff) | |
| download | emacs-678fb7066698ebfe3aecba722294025ed26da01b.tar.gz emacs-678fb7066698ebfe3aecba722294025ed26da01b.zip | |
merge trunk
Diffstat (limited to 'src/ChangeLog.6')
| -rw-r--r-- | src/ChangeLog.6 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6 index 74141f6813a..91c20681157 100644 --- a/src/ChangeLog.6 +++ b/src/ChangeLog.6 | |||
| @@ -5354,7 +5354,7 @@ | |||
| 5354 | 5354 | ||
| 5355 | See ChangeLog.5 for earlier changes. | 5355 | See ChangeLog.5 for earlier changes. |
| 5356 | 5356 | ||
| 5357 | Copyright (C) 1995-1996, 2001-2011 Free Software Foundation, Inc. | 5357 | Copyright (C) 1995-1996, 2001-2012 Free Software Foundation, Inc. |
| 5358 | 5358 | ||
| 5359 | This file is part of GNU Emacs. | 5359 | This file is part of GNU Emacs. |
| 5360 | 5360 | ||