diff options
| author | Werner Koch <[email protected]> | 2011-01-24 11:24:11 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2011-01-24 11:24:11 +0000 |
| commit | c5e8a4c0fdde7f4aef2163a3710483c87bdf3161 (patch) | |
| tree | ae9da511231485f5c8ba8faeb3e7db3b971fe8ff /ChangeLog | |
| parent | Fix regression introduced by "editing only change". (diff) | |
| parent | Remove keyserver/ from the build system. (diff) | |
| download | gnupg-c5e8a4c0fdde7f4aef2163a3710483c87bdf3161.tar.gz gnupg-c5e8a4c0fdde7f4aef2163a3710483c87bdf3161.zip | |
Merge branch 'master' into ECC-INTEGRATION-2-1
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,13 @@ +2011-01-20 Werner Koch <[email protected]> + + * configure.ac (AC_CONFIG_FILES): Remove keyserver/. + +2011-01-19 Werner Koch <[email protected]> + + * 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 <[email protected]> * configure.ac: Need Libgcrypt 1.4.6 due to AESWRAP. @@ -21,7 +31,7 @@ 2010-11-17 Werner Koch <[email protected]> - * configure.ac (ENABLE_CARD_SUPPORT): Define. + * configure.ac (ENABLE_CARD_SUPPORT): Define. 2010-10-27 Werner Koch <[email protected]> |