diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md index e16e6b5b0..bf84dd056 100644 --- a/contrib/devtools/README.md +++ b/contrib/devtools/README.md @@ -1,8 +1,7 @@ -Contents -=========== +# Contents This directory contains tools for developers working on this repository. -github-merge.sh +# github-merge.sh ================== A small script to automate merging pull-requests securely and sign them with GPG. diff --git a/doc/wallet-backup.md b/doc/wallet-backup.md index a3c792e45..69bd9bc23 100644 --- a/doc/wallet-backup.md +++ b/doc/wallet-backup.md @@ -22,7 +22,7 @@ For all methods, you will need to include an export directory setting in your co You may chose any directory within the home directory as the location for export & backup files. If the directory doesn't exist, it will be created. -Note that zcashd will need to be stopped and restarted for edits in the config file to take effect. +Note that hushd will need to be stopped and restarted for edits in the config file to take effect. ### Using `backupwallet` diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py index c39637073..a6a54a4d2 100755 --- a/qa/rpc-tests/test_framework/mininode.py +++ b/qa/rpc-tests/test_framework/mininode.py @@ -38,7 +38,7 @@ MY_SUBVERSION = "/python-mininode-tester:0.0.1/" MAX_INV_SZ = 50000 -COIN = 100000000 # 1 zec in zatoshis +COIN = 100000000 # 1 Hush in puposhis # Keep our own socket map for asyncore, so that we can track disconnects # ourselves (to workaround an issue with closing an asyncore socket when diff --git a/src/.main.cpp.swo b/src/.main.cpp.swo new file mode 100644 index 000000000..144c18a5b Binary files /dev/null and b/src/.main.cpp.swo differ diff --git a/src/util.h b/src/util.h index 5fb9daa92..5239323e5 100644 --- a/src/util.h +++ b/src/util.h @@ -1,5 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin Core developers +// Copyright (c) 2017 The Hush developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php.