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.3 | |
| 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.3')
| -rw-r--r-- | src/ChangeLog.3 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3 index e3ba2b37ccd..a361142faae 100644 --- a/src/ChangeLog.3 +++ b/src/ChangeLog.3 | |||
| @@ -16507,8 +16507,7 @@ See ChangeLog.2 for earlier changes. | |||
| 16507 | ;; coding: utf-8 | 16507 | ;; coding: utf-8 |
| 16508 | ;; End: | 16508 | ;; End: |
| 16509 | 16509 | ||
| 16510 | Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 16510 | Copyright (C) 1993, 2001-2011 Free Software Foundation, Inc. |
| 16511 | Free Software Foundation, Inc. | ||
| 16512 | 16511 | ||
| 16513 | This file is part of GNU Emacs. | 16512 | This file is part of GNU Emacs. |
| 16514 | 16513 | ||
| @@ -16524,5 +16523,3 @@ See ChangeLog.2 for earlier changes. | |||
| 16524 | 16523 | ||
| 16525 | You should have received a copy of the GNU General Public License | 16524 | You should have received a copy of the GNU General Public License |
| 16526 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | 16525 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 16527 | |||
| 16528 | ;;; arch-tag: 136a8e5c-4f83-403b-9132-874f1c47f8a9 | ||