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.4 | |
| 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.4')
| -rw-r--r-- | src/ChangeLog.4 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/ChangeLog.4 b/src/ChangeLog.4 index c853ad7b4a6..dc8fe23a221 100644 --- a/src/ChangeLog.4 +++ b/src/ChangeLog.4 | |||
| @@ -6906,8 +6906,7 @@ See ChangeLog.3 for earlier changes. | |||
| 6906 | ;; coding: utf-8 | 6906 | ;; coding: utf-8 |
| 6907 | ;; End: | 6907 | ;; End: |
| 6908 | 6908 | ||
| 6909 | Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 6909 | Copyright (C) 1993-1994, 2001-2011 Free Software Foundation, Inc. |
| 6910 | Free Software Foundation, Inc. | ||
| 6911 | 6910 | ||
| 6912 | This file is part of GNU Emacs. | 6911 | This file is part of GNU Emacs. |
| 6913 | 6912 | ||
| @@ -6923,5 +6922,3 @@ See ChangeLog.3 for earlier changes. | |||
| 6923 | 6922 | ||
| 6924 | You should have received a copy of the GNU General Public License | 6923 | You should have received a copy of the GNU General Public License |
| 6925 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | 6924 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 6926 | |||
| 6927 | ;;; arch-tag: 2e44924a-e45a-4129-ad93-1f7bb410b609 | ||