diff options
Diffstat (limited to 'g10/ChangeLog')
| -rw-r--r-- | g10/ChangeLog | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index fe5c58312..10f889312 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,12 +1,17 @@ -Wed Sep 1 15:30:44 CEST 1999 Werner Koch <[email protected]> +Thu Sep 2 16:40:55 CEST 1999 Werner Koch <[email protected]> + + * import.c (merge_blocks): First add new subkeys, then merge subkey + certificates. + (merge_sigs): Don't merge subkey signatures here. + +Wed Sep 1 15:30:44 CEST 1999 Werner Koch <[email protected]> * keygen.c (ask_expire_interval): Fixed bug related to cpr_xx (tnx Francis J. Lacoste). Tue Aug 31 17:20:44 CEST 1999 Werner Koch <[email protected]> - * plaintext.c (do_hash): Hash CR,LF for a single CR. (ask_for_detached_datafile): Changed arguments to be closer to those of hash_datafiles and cleanup the code a bit. |