Mercurial > emacs
comparison src/ChangeLog.6 @ 90737:95d0cdf160ea
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 586-614)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- Merge from erc--main--0
- Make byte compiler correctly write circular constants
* gnus--rel--5.10 (patch 186-196)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 26 Jan 2007 06:16:11 +0000 |
parents | 02f1dbc4a199 e90d04cd455a |
children | 52a7f3f50b89 |
comparison
equal
deleted
inserted
replaced
90736:ef1369583937 | 90737:95d0cdf160ea |
---|---|
5360 * Makefile.in.in (SOME_MACHINE_OBJECTS): Add dosfns.o, | 5360 * Makefile.in.in (SOME_MACHINE_OBJECTS): Add dosfns.o, |
5361 intervals.o, textprop.o. | 5361 intervals.o, textprop.o. |
5362 | 5362 |
5363 See ChangeLog.5 for earlier changes. | 5363 See ChangeLog.5 for earlier changes. |
5364 | 5364 |
5365 Copyright (C) 1995, 1996 Free Software Foundation, Inc. | 5365 Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007 |
5366 Free Software Foundation, Inc. | |
5366 Copying and distribution of this file, with or without modification, | 5367 Copying and distribution of this file, with or without modification, |
5367 are permitted provided the copyright notice and this notice are preserved. | 5368 are permitted provided the copyright notice and this notice are preserved. |
5368 | 5369 |
5369 ;;; arch-tag: 66a98e1c-2268-45e8-8a57-286b9c85a4e9 | 5370 ;;; arch-tag: 66a98e1c-2268-45e8-8a57-286b9c85a4e9 |