Mercurial > emacs
comparison admin/ChangeLog @ 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 | e4e4a56ef723 3d45362f1d38 |
children | f83d17e1ace6 |
comparison
equal
deleted
inserted
replaced
90736:ef1369583937 | 90737:95d0cdf160ea |
---|---|
403 ;; Local Variables: | 403 ;; Local Variables: |
404 ;; coding: iso-2022-7bit | 404 ;; coding: iso-2022-7bit |
405 ;; add-log-time-zone-rule: t | 405 ;; add-log-time-zone-rule: t |
406 ;; End: | 406 ;; End: |
407 | 407 |
408 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software | 408 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 |
409 Foundation, Inc. | 409 Free Software Foundation, Inc. |
410 Copying and distribution of this file, with or without modification, | 410 Copying and distribution of this file, with or without modification, |
411 are permitted provided the copyright notice and this notice are preserved. | 411 are permitted provided the copyright notice and this notice are preserved. |
412 | 412 |
413 ;;; arch-tag: 97728c77-77c0-4156-b669-0e8c07d94e5a | 413 ;;; arch-tag: 97728c77-77c0-4156-b669-0e8c07d94e5a |