zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into feature/wallet_orchard

This commit is contained in:
Kris Nuttycombe 2022-03-18 19:19:50 -06:00
parent 4392375404 d724c81289
commit b73ca36c45
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
COPYING
View File

@ -1,6 +1,6 @@
Copyright (c) 2016-2021 The Zcash developers
Copyright (c) 2009-2021 The Bitcoin Core developers
Copyright (c) 2009-2021 Bitcoin Developers
Copyright (c) 2016-2022 The Zcash developers
Copyright (c) 2009-2022 The Bitcoin Core developers
Copyright (c) 2009-2022 Bitcoin Developers
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
configure.ac
View File

@ -7,7 +7,7 @@ define(_CLIENT_VERSION_BUILD, 51)
define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2021)
define(_COPYRIGHT_YEAR, 2022)
AC_INIT([Zcash],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_SUFFIX(_ZC_BUILD_VAL)],[https://github.com/zcash/zcash/issues],[zcash])
AC_CONFIG_SRCDIR([src/main.cpp])
AC_CONFIG_HEADERS([src/config/bitcoin-config.h])

6
contrib/debian/copyright
View File

@ -4,9 +4,9 @@ Upstream-Contact: Electric Coin Company <team@electriccoin.co>
Source: https://github.com/zcash/zcash
Files: *
Copyright: 2016-2021, The Zcash developers
2009-2021, Bitcoin Core developers
2009-2021, Bitcoin Developers
Copyright: 2016-2022, The Zcash developers
2009-2022, Bitcoin Core developers
2009-2022, Bitcoin Developers
License: Expat
Comment: The Bitcoin Core developers encompasses the current developers listed on
bitcoin.org, as well as the numerous contributors to the project.

1
src/Makefile.am
View File

@ -245,6 +245,7 @@ BITCOIN_CORE_H = \
uint252.h \
undo.h \
util.h \
util/match.h \
utilmoneystr.h \
utilstrencodings.h \
utiltest.h \

4
src/clientversion.h
View File

@ -1,5 +1,5 @@
// Copyright (c) 2009-2014 The Bitcoin Core developers
// Copyright (c) 2016-2021 The Zcash developers
// Copyright (c) 2016-2022 The Zcash developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or https://www.opensource.org/licenses/mit-license.php .
@ -27,7 +27,7 @@
* Copyright year (2009-this)
* Todo: update this when changing our copyright comments in the source
*/
#define COPYRIGHT_YEAR 2021
#define COPYRIGHT_YEAR 2022
#endif //HAVE_CONFIG_H