diff options
author | Werner Koch <[email protected]> | 2018-05-13 11:29:40 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2018-05-13 11:29:40 +0000 |
commit | 7b7576637ddfb6e426e77a86b05af6d828e585d5 (patch) | |
tree | 21919eed435194f8db1dac8150b581a731a66e26 /common/argparse.c | |
parent | doc: Include release info from 2.2.6 (diff) | |
parent | doc: Fix URL in NEWS. (diff) | |
download | gnupg-7b7576637ddfb6e426e77a86b05af6d828e585d5.tar.gz gnupg-7b7576637ddfb6e426e77a86b05af6d828e585d5.zip |
Merge branch 'STABLE-BRANCH-2-2' into master
--
Resolved Conflicts:
NEWS - removed
configure.ac - removed
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'common/argparse.c')
0 files changed, 0 insertions, 0 deletions