summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2011-01-24 12:24:11 +0100
committerWerner Koch <wk@gnupg.org>2011-01-24 12:24:11 +0100
commitc5e8a4c0fdde7f4aef2163a3710483c87bdf3161 (patch)
treeae9da511231485f5c8ba8faeb3e7db3b971fe8ff /ChangeLog
parentFix regression introduced by "editing only change". (diff)
parentRemove keyserver/ from the build system. (diff)
downloadgnupg2-c5e8a4c0fdde7f4aef2163a3710483c87bdf3161.tar.xz
gnupg2-c5e8a4c0fdde7f4aef2163a3710483c87bdf3161.zip
Merge branch 'master' into ECC-INTEGRATION-2-1
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog12
1 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 287e4d1c2..d3e7eb1a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-20 Werner Koch <wk@g10code.com>
+
+ * configure.ac (AC_CONFIG_FILES): Remove keyserver/.
+
+2011-01-19 Werner Koch <wk@g10code.com>
+
+ * configure.ac: Add new option --enable-gpg2-is-gpg.
+ (NAME_OF_INSTALLED_GPG): New ac_define.
+ * autogen.sh [--build-w32ce]: Use --enable-gpg2-is-gpg.
+
2011-01-21 Werner Koch <wk@g10code.com>
* configure.ac: Need Libgcrypt 1.4.6 due to AESWRAP.
@@ -21,7 +31,7 @@
2010-11-17 Werner Koch <wk@g10code.com>
- * configure.ac (ENABLE_CARD_SUPPORT): Define.
+ * configure.ac (ENABLE_CARD_SUPPORT): Define.
2010-10-27 Werner Koch <wk@g10code.com>