* epa-dired.el: emacs-merge
authorueno <ueno>
Fri, 8 Feb 2008 07:43:04 +0000 (07:43 +0000)
committerueno <ueno>
Fri, 8 Feb 2008 07:43:04 +0000 (07:43 +0000)
commit691258b0302f2e5d73d5ab91b5433e5b814dd137
tree16ce7bcef36d106de88707995b8e4d34fc0348ff
parentd4af47f3f5afd516eb2c2b2797c4e0f865726b89
* epa-dired.el:
* epa-mail.el:
* epa.el:
* epg-package-info.el:
* epa-file.el:
* epa-setup.el:
* epg-config.el:
* epg.el: License changed from GPL2+ to GPL3+.

* epa.texi: License changed from FDL1.1 to FDL1.2; re-arrange headers.
ChangeLog
epa-dired.el
epa-file.el
epa-mail.el
epa-setup.el
epa.el
epa.texi
epg-config.el
epg.el