CVS update: gnupg/g10

[Werner Koch]

Date:	Thursday September 2, 1999 @ 16:50
Author:	wkoch

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

Modified Files:
	ChangeLog import.c 
Log Message:
Thu Sep  2 16:40:55 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>


	* import.c (merge_blocks): First add new subkeys, then merge subkey
	certificates.
	(merge_sigs): Don't merge subkey signatures here.


File: ChangeLog        	Status: Up-to-date
File: import.c         	Status: Up-to-date