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.7 | |
| 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.7')
| -rw-r--r-- | src/ChangeLog.7 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7 index b5927108808..d5bebec660f 100644 --- a/src/ChangeLog.7 +++ b/src/ChangeLog.7 | |||
| @@ -11092,8 +11092,7 @@ See ChangeLog.6 for earlier changes. | |||
| 11092 | ;; coding: utf-8 | 11092 | ;; coding: utf-8 |
| 11093 | ;; End: | 11093 | ;; End: |
| 11094 | 11094 | ||
| 11095 | Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 11095 | Copyright (C) 1997-1998, 2001-2011 Free Software Foundation, Inc. |
| 11096 | Free Software Foundation, Inc. | ||
| 11097 | 11096 | ||
| 11098 | This file is part of GNU Emacs. | 11097 | This file is part of GNU Emacs. |
| 11099 | 11098 | ||
| @@ -11109,5 +11108,3 @@ See ChangeLog.6 for earlier changes. | |||
| 11109 | 11108 | ||
| 11110 | You should have received a copy of the GNU General Public License | 11109 | You should have received a copy of the GNU General Public License |
| 11111 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | 11110 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 11112 | |||
| 11113 | ;;; arch-tag: 3b03e091-1123-4031-b67d-41683932cc48 | ||