summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2009-11-03 19:54:06 +0000
committerWerner Koch <wk@gnupg.org>2009-11-03 19:54:06 +0000
commitbd6b75cc17627c2e9208eb33c0dd8a9990213494 (patch)
tree9e297bd27c4c2c965ded2bce7f02d02e226bbaa6 /ChangeLog
parente6ed68e8290c4e746210c0df04d0c4d5d18b9c9b (diff)
downloadlibgpg-error-bd6b75cc17627c2e9208eb33c0dd8a9990213494.tar.gz
Resolved changelog conflict
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d658fea..5fd1ace 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
* src/gpg-error.h.in (GPG_ERR_SOURCE_DIM): Reduce to 128.
+2009-09-29 Werner Koch <wk@g10code.com>
+
+ * src/err-codes.h.in (GPG_ERR_NO_ENGINE): New.
+
2009-09-21 Werner Koch <wk@g10code.com>
* src/err-sources.h.in (GPG_ERR_SOURCE_G13): New.