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 /scd/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 'scd/ChangeLog-2011')
| -rw-r--r-- | scd/ChangeLog-2011 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/scd/ChangeLog-2011 b/scd/ChangeLog-2011 index 5a87a4c79..9184af4c5 100644 --- a/scd/ChangeLog-2011 +++ b/scd/ChangeLog-2011 @@ -87,10 +87,6 @@ (handle_control): New. (main): Handle the case 6 of handle_control. -2011-10-13 Marcus Brinkmann <[email protected]> - - * Makefile.am, apdu.c, app.c, command.c, scdaemon.c: Port to Npth. - 2011-08-10 Werner Koch <[email protected]> * command.c (cmd_killscd): Use the new assuan force close flag |