diff options
author | Werner Koch <[email protected]> | 2017-09-26 10:00:03 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2017-09-26 10:00:03 +0000 |
commit | cd2d758f3f9e0007ecd6bae9d2ee0d631773e237 (patch) | |
tree | 0e1b9c898d0527969fa953e0f1fc418e610c8da4 /g10/sig-check.c | |
parent | g10: Select a secret key by checking availability under gpg-agent. (diff) | |
parent | po: Remove trailing colon from a German pinentry string. (diff) | |
download | gnupg-cd2d758f3f9e0007ecd6bae9d2ee0d631773e237.tar.gz gnupg-cd2d758f3f9e0007ecd6bae9d2ee0d631773e237.zip |
Merge branch 'STABLE-BRANCH-2-2' into master
--
Signed-off-by: Werner Koch <[email protected]>
Conflicts:
NEWS - include release info from 2.2.1
configure.ac - keep master.
Diffstat (limited to 'g10/sig-check.c')
0 files changed, 0 insertions, 0 deletions