mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
Merge branch 'STABLE-BRANCH-2-4'
-- Resolved conflicts: NEWS common/exechelp-w32.c configure.ac
This commit is contained in:
commit
4485930f9f
103 changed files with 1485 additions and 1135 deletions
|
@ -86,8 +86,8 @@ struct
|
|||
/* Enable pinentry debugging (--debug 1024 should also be used). */
|
||||
int debug_pinentry;
|
||||
|
||||
/* Filename of the program to start as pinentry. */
|
||||
const char *pinentry_program;
|
||||
/* Filename of the program to start as pinentry (malloced). */
|
||||
char *pinentry_program;
|
||||
|
||||
/* Filename of the program to handle daemon tasks. */
|
||||
const char *daemon_program[DAEMON_MAX_TYPE];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue