mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
Merge branch 'STABLE-BRANCH-2-4'
-- Fixed conflicts: NEWS configure.ac doc/gpg.texi
This commit is contained in:
commit
dfa60c09f5
88 changed files with 2655 additions and 1419 deletions
|
@ -525,7 +525,7 @@ AH_BOTTOM([
|
|||
#define GNUPG_OPENPGP_REVOC_DIR "openpgp-revocs.d"
|
||||
#define GNUPG_CACHE_DIR "cache.d"
|
||||
|
||||
#define GNUPG_DEF_COPYRIGHT_LINE "Copyright (C) 2023 g10 Code GmbH"
|
||||
#define GNUPG_DEF_COPYRIGHT_LINE "Copyright (C) 2024 g10 Code GmbH"
|
||||
|
||||
/* For some systems (DOS currently), we hardcode the path here. For
|
||||
POSIX systems the values are constructed by the Makefiles, so that
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue