Mercurial > emacs
comparison lisp/epa-file.el @ 112228:417b1e4d63cd
Merge from emacs-23
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 14 Jan 2011 12:18:41 -0500 |
parents | c6bcd9fc6536 376148b31b5e |
children | ef719132ddfa |
comparison
equal
deleted
inserted
replaced
112227:07e52ed69b5d | 112228:417b1e4d63cd |
---|---|
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, 2010 Free Software Foundation, Inc. | 2 ;; Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 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 ;; Package: epa | 6 ;; Package: epa |
7 | 7 |