Merge branch 'duke' of https://github.com/MyHush/hush3 into duke

2019-12-21 00:02:30 -05:00
parent 4c42d5f93f 9b568e8683
commit b243f63ed6
14 changed files with 485 additions and 37 deletions
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -1,5 +1,6 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2014 The Bitcoin Core developers
+// Copyright (c) 2019      The Hush developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.