Mercurial > emacs
comparison lisp/epa-file.el @ 107617:c5f9e4613394
Merge from mainline.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 16 Jan 2010 06:57:09 -0500 |
parents | 1d1d5d9bd884 |
children | b70c159d9e1e 376148b31b5e |
comparison
equal
deleted
inserted
replaced
107616:fa5ad3eee9f5 | 107617:c5f9e4613394 |
---|---|
1 ;;; epa-file.el --- the EasyPG Assistant, transparent file encryption | 1 ;;; epa-file.el --- the EasyPG Assistant, transparent file encryption |
2 ;; Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | 2 ;; Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
3 | 3 |
4 ;; Author: Daiki Ueno <ueno@unixuser.org> | 4 ;; Author: Daiki Ueno <ueno@unixuser.org> |
5 ;; Keywords: PGP, GnuPG | 5 ;; Keywords: PGP, GnuPG |
6 | 6 |
7 ;; This file is part of GNU Emacs. | 7 ;; This file is part of GNU Emacs. |