Merge branch 'dev'

This commit is contained in:
Duke Leto
2019-12-14 07:11:48 -05:00
61 changed files with 486 additions and 2364 deletions

View File

@@ -56,7 +56,7 @@
#define DO_STRINGIZE(X) #X
//! Copyright string used in Windows .rc files
#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core Developers, The Zcash developers, Komodo developers, Hush developers and Verus developers"
#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core Developers, The Zcash developers, Komodo developers, Hush developers"
/**
* bitcoind-res.rc includes this file, but it cannot cope with real c++ code.