Mercurial > emacs
comparison lisp/gnus/mailcap.el @ 90224:2d92f5c9d6ae
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-78
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 514-518)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 104-105)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 26 Aug 2005 09:51:52 +0000 |
parents | f9a65d7ebd29 fafd692d1e40 |
children | 5b7d410e31f9 |
comparison
equal
deleted
inserted
replaced
90223:edf295560b5a | 90224:2d92f5c9d6ae |
---|---|
1 ;;; mailcap.el --- MIME media types configuration | 1 ;;; mailcap.el --- MIME media types configuration |
2 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 | 2 |
3 ;; Free Software Foundation, Inc. | 3 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
4 ;; 2005 Free Software Foundation, Inc. | |
4 | 5 |
5 ;; Author: William M. Perry <wmperry@aventail.com> | 6 ;; Author: William M. Perry <wmperry@aventail.com> |
6 ;; Lars Magne Ingebrigtsen <larsi@gnus.org> | 7 ;; Lars Magne Ingebrigtsen <larsi@gnus.org> |
7 ;; Keywords: news, mail, multimedia | 8 ;; Keywords: news, mail, multimedia |
8 | 9 |