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
|
@ -455,6 +455,9 @@ main (int argc, char **argv)
|
|||
pargs.argv = &argv;
|
||||
pargs.flags |= (ARGPARSE_FLAG_RESET
|
||||
| ARGPARSE_FLAG_KEEP
|
||||
#if GPGRT_VERSION_NUMBER >= 0x013000 /* >= 1.48 */
|
||||
| ARGPARSE_FLAG_COMMAND
|
||||
#endif
|
||||
| ARGPARSE_FLAG_SYS
|
||||
| ARGPARSE_FLAG_USER);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue