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.8 | |
| 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.8')
| -rw-r--r-- | src/ChangeLog.8 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8 index 9c38b29ff32..833119c9fcf 100644 --- a/src/ChangeLog.8 +++ b/src/ChangeLog.8 | |||
| @@ -13979,8 +13979,7 @@ | |||
| 13979 | 13979 | ||
| 13980 | See ChangeLog.7 for earlier changes. | 13980 | See ChangeLog.7 for earlier changes. |
| 13981 | 13981 | ||
| 13982 | Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 13982 | Copyright (C) 1999, 2001-2011 Free Software Foundation, Inc. |
| 13983 | Free Software Foundation, Inc. | ||
| 13984 | 13983 | ||
| 13985 | This file is part of GNU Emacs. | 13984 | This file is part of GNU Emacs. |
| 13986 | 13985 | ||
| @@ -13996,5 +13995,3 @@ See ChangeLog.7 for earlier changes. | |||
| 13996 | 13995 | ||
| 13997 | You should have received a copy of the GNU General Public License | 13996 | You should have received a copy of the GNU General Public License |
| 13998 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | 13997 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 13999 | |||
| 14000 | ;;; arch-tag: 4d73444a-8f6e-4255-92a6-d3abc438b8d3 | ||