CVS update: gnupg/g10

[Werner Koch]

Date:	Thursday July 27, 2000 @ 17:33
Author:	wkoch

Update of /home/koch/cvs/gnupg/g10
In directory sigtrap:/tmp/cvs-serv1155/g10

Modified Files:
      Tag: STABLE-BRANCH-1-0
	ChangeLog g10.c import.c options.h 
Log Message:
Thu Jul 27 17:33:04 CEST 2000  Werner Koch  <wk@openit.de>

  * g10.c: New option --merge-only.  Suggested by Brendan O'Dea.
  * import.c (import_one): Implemented it here
  (import_secret_one): Ditto.
  (print_stats): and give some stats.


File: ChangeLog        	Status: Up-to-date
File: g10.c            	Status: Up-to-date
File: import.c         	Status: Up-to-date
File: options.h        	Status: Up-to-date