diff options
| author | Marcus Brinkmann <[email protected]> | 2012-01-03 17:13:19 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2012-01-03 17:13:19 +0000 |
| commit | 0868997e186cd847663668f9d7a29806a12da2d2 (patch) | |
| tree | 73645f778a2d16213723121a76d2b38ca90edfcc /ChangeLog-2011 | |
| parent | Add lost ChangeLog entry. (diff) | |
| parent | Silence gcc warning. (diff) | |
| download | gnupg-npth.tar.gz gnupg-npth.zip | |
Merge branch 'master' into npthnpth
Conflicts:
ChangeLog-2011
Makefile.am
agent/ChangeLog-2011
agent/gpg-agent.c
dirmngr/ChangeLog-2011
dirmngr/dirmngr.c
doc/HACKING
g13/g13.c
po/de.po
scd/ChangeLog-2011
scd/apdu.c
scd/command.c
scd/scdaemon.c
scripts/gitlog-to-changelog
tools/ChangeLog-2011
Diffstat (limited to 'ChangeLog-2011')
| -rw-r--r-- | ChangeLog-2011 | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/ChangeLog-2011 b/ChangeLog-2011 index 82f45a8cf..cfba8f473 100644 --- a/ChangeLog-2011 +++ b/ChangeLog-2011 @@ -14,21 +14,6 @@ accept --with-libgpg-error-prefix as well as --with-gpg-error-prefix * m4/gpg-error.m4: Update from git master. -2011-10-13 Marcus Brinkmann <[email protected]> - - * configure.ac: Fix npth version check. - * m4/npth.m4: Fix version check. - -2011-09-26 Marcus Brinkmann <[email protected]> - - * configure.ac: Don't check for PTH but for NPTH. - (AH_BOTTOM): Remove PTH_SYSCALL_SOFT. - (have_pth): Rename to ... - (have_npth): ... this. - (USE_GNU_NPTH): Rename to ... - (USE_GNU_PTH): ... this. - * m4/gnupg-npth.m4: New file. - 2011-09-23 Werner Koch <[email protected]> * configure.ac: Remove check for gcry_kdf_derive. |