diff options
Diffstat (limited to 'g10/ChangeLog')
| -rw-r--r-- | g10/ChangeLog | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 6c5d957d2..52188192d 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,15 @@ +2002-05-05 David Shaw <[email protected]> + + * import.c (import_one): When merging with a key we already have, + don't let a key conflict (same keyid but different key) stop the + import: just skip the bad key and continue. + + * exec.c (make_tempdir): Under Win32, don't try environment + variables for temp directories - GetTempDir tries environment + variables internally, and it's better not to second-guess it in + case MS adds some sort of temp dir handling to Windows at some + point. + 2002-05-05 Timo Schulz <[email protected]> * mainproc.c (proc_symkey_enc): Don't ask for a passphrase |