mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Merge branch 'STABLE-BRANCH-2-2' into master
This commit is contained in:
commit
d4dc4245bf
36 changed files with 516 additions and 135 deletions
|
@ -88,6 +88,7 @@ struct
|
|||
int with_key_screening; /* Option --with-key-screening active. */
|
||||
|
||||
int pinentry_mode;
|
||||
int request_origin;
|
||||
|
||||
int armor; /* force base64 armoring (see also ctrl.with_base64) */
|
||||
int no_armor; /* don't try to figure out whether data is base64 armored*/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue