Merge branch 'STABLE-BRANCH-2-2' into master
authorWerner Koch <wk@gnupg.org>
Tue, 27 Mar 2018 06:48:00 +0000 (08:48 +0200)
committerWerner Koch <wk@gnupg.org>
Tue, 27 Mar 2018 06:48:00 +0000 (08:48 +0200)
commitd4dc4245bf0221d2db4118718fc2528ecf43b97b
tree5912abc9b9ba056a882bcd933105ba4dde73c560
parentfa0ed1c7e2eee7c559026696e6b21acc882a97aa
parent02dce8c0cc57deb2095a9b06aeb8f4dea34eef7e
Merge branch 'STABLE-BRANCH-2-2' into master
21 files changed:
agent/agent.h
agent/command-ssh.c
agent/command.c
agent/cvt-openpgp.c
configure.ac
doc/Makefile.am
doc/gpg.texi
doc/gpgsm.texi
g10/call-agent.c
g10/card-util.c
g10/gpg.c
g10/gpg.h
g10/keyedit.c
g10/misc.c
g10/options.h
g10/parse-packet.c
g10/tdbdump.c
scd/apdu.c
scd/app-openpgp.c
sm/gpgsm.c
sm/gpgsm.h