summaryrefslogtreecommitdiffstats
path: root/doc/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'doc/ChangeLog')
-rw-r--r--doc/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0ceb6e05c..85ac9c518 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-12 Werner Koch <wk@g10code.com>
+
+ * Makefile.am (man_MANS): Do not install gnupg.7 due to a conflict
+ with gpg1.
+
2006-10-12 David Shaw <dshaw@jabberwocky.com>
* gpg.texi: Document --s2k-count.