Merge branch 'STABLE-BRANCH-2-2' into master
Fixed conflicts:
NEWS - keep master configure.ac - merge g10/card-util.c - mostly 2.2 g10/sig-check.c - 2.2
Description
Description
Details
Details
- Provenance
• werner Authored on Apr 10 2018, 10:14 AM - Parents
- rG9f69dbeb902a: agent: Improve the unknown ssh flag detection.
rGd4dc4245bf02: Merge branch 'STABLE-BRANCH-2-2' into master - Branches
- Unknown
- Tags
- Unknown
Event Timeline
Merged Changes
Merged Changes
- 30081d2851e0 Post release updatesAuthor
- 6fbe2ddbaf51 Release 2.2.6Author
- f1f072c501cd po: Auto-update.Author
- b46b14392540 po: Update German translationAuthor
- 7fa6f1481454 doc: Typo fix in gpg.texiAuthor
- a4e26f2ee852 doc: Document --key-edit:change-usageAuthor
- 80b775bdbb85 agent: Support SSH signature flags.Author
- d27417d3a571 gpg: Add new OpenPGP card vendor.Author
- cb1731c23cdd scd: Writing KDF resets auth state.Author
- a17d2d1f690e g10: Fix filtering by PK->REQ_USAGE.Author
- 6705ee42a4bd po: Update Japanese translation.Author