Mercurial > emacs
comparison lisp/pgg-gpg.el @ 107617:c5f9e4613394
Merge from mainline.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 16 Jan 2010 06:57:09 -0500 |
parents | 1d1d5d9bd884 |
children | 280c8ae2476d 376148b31b5e |
comparison
equal
deleted
inserted
replaced
107616:fa5ad3eee9f5 | 107617:c5f9e4613394 |
---|---|
1 ;;; pgg-gpg.el --- GnuPG support for PGG. | 1 ;;; pgg-gpg.el --- GnuPG support for PGG. |
2 | 2 |
3 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, | 3 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, |
4 ;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | 4 ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
5 | 5 |
6 ;; Author: Daiki Ueno <ueno@unixuser.org> | 6 ;; Author: Daiki Ueno <ueno@unixuser.org> |
7 ;; Symmetric encryption and gpg-agent support added by: | 7 ;; Symmetric encryption and gpg-agent support added by: |
8 ;; Sascha Wilde <wilde@sha-bang.de> | 8 ;; Sascha Wilde <wilde@sha-bang.de> |
9 ;; Created: 1999/10/28 | 9 ;; Created: 1999/10/28 |