aboutsummaryrefslogtreecommitdiffstats
path: root/g10/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'g10/ChangeLog')
-rw-r--r--g10/ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 7e0fefdbd..c7fad87c5 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-12 David Shaw <[email protected]>
+
+ * getkey.c (merge_selfsigs_main, merge_selfsigs_subkey): Make sure
+ that even after keys may be merged together, we only have one
+ chosen selfsig.
+
2005-06-09 David Shaw <[email protected]>
* options.h, import.c (parse_import_options, delete_inv_parts):