mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Merge branch 'STABLE-BRANCH-2-4' into master
-- Fixed conflicts in: NEWS g10/call-agent.c g10/options.h kbx/kbxutil.c tools/gpgconf.c
This commit is contained in:
commit
287e717b55
7 changed files with 127 additions and 68 deletions
|
@ -457,6 +457,7 @@ main (int argc, char **argv)
|
|||
/* Make sure that our subsystems are ready. */
|
||||
i18n_init ();
|
||||
init_common_subsystems (&argc, &argv);
|
||||
setup_libgcrypt_logging ();
|
||||
|
||||
/*create_dotlock(NULL); register locking cleanup */
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue