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 /agent/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 '')
| -rw-r--r-- | agent/ChangeLog-2011 | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/agent/ChangeLog-2011 b/agent/ChangeLog-2011 index c074d1b65..f56be1f44 100644 --- a/agent/ChangeLog-2011 +++ b/agent/ChangeLog-2011 @@ -12,17 +12,6 @@ (ssh_handler_request_identities): Do not call card_key_available if the scdaemon is disabled. -2011-10-13 Marcus Brinkmann <[email protected]> - - * gpg-agent.c (start_connection_thread) - (start_connection_thread_ssh): Cast npth_self result to unsigned - long for safety. - - * cache.c (new_data): Fix error check. - - * cache.c, call-pinentry.c, call-scd.c, findkey.c, gpg-agent.c, - trustlist.c: Port to NPth. - 2011-09-12 Ben Kibbey <[email protected]> * genkey.c (agent_ask_new_passphrase): Allow for an empty passphrase |