diff options
| author | Joakim Verona | 2011-02-05 11:23:09 +0100 |
|---|---|---|
| committer | Joakim Verona | 2011-02-05 11:23:09 +0100 |
| commit | 4bd51ad5c3445b644dfb017d5b57b10a90aa325f (patch) | |
| tree | 894801e7308ce4ecc34933f959e28f4b9cff9533 /src/ChangeLog.6 | |
| parent | 13cfe8df462ab8da9f0028e16cc84dcaceaca3d1 (diff) | |
| parent | 9bcaafce5351d270ac514e23cb69ff1a5fd35229 (diff) | |
| download | emacs-4bd51ad5c3445b644dfb017d5b57b10a90aa325f.tar.gz emacs-4bd51ad5c3445b644dfb017d5b57b10a90aa325f.zip | |
merge from upstream. currently seems to have bitroted and i get segfaults
Diffstat (limited to 'src/ChangeLog.6')
| -rw-r--r-- | src/ChangeLog.6 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6 index 3b1bdbffabc..d7903568102 100644 --- a/src/ChangeLog.6 +++ b/src/ChangeLog.6 | |||
| @@ -5354,8 +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, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 5357 | Copyright (C) 1995-1996, 2001-2011 Free Software Foundation, Inc. |
| 5358 | Free Software Foundation, Inc. | ||
| 5359 | 5358 | ||
| 5360 | This file is part of GNU Emacs. | 5359 | This file is part of GNU Emacs. |
| 5361 | 5360 | ||
| @@ -5371,5 +5370,3 @@ See ChangeLog.5 for earlier changes. | |||
| 5371 | 5370 | ||
| 5372 | You should have received a copy of the GNU General Public License | 5371 | You should have received a copy of the GNU General Public License |
| 5373 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | 5372 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 5374 | |||
| 5375 | ;;; arch-tag: 66a98e1c-2268-45e8-8a57-286b9c85a4e9 | ||