From 8774b1031c300b8ffffa1342fd315e10c417426e Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Sat, 7 Oct 2017 22:58:00 -0700 Subject: [PATCH] Various branding changes and some copyrights --- contrib/devtools/README.md | 5 ++--- doc/wallet-backup.md | 2 +- qa/rpc-tests/test_framework/mininode.py | 2 +- src/.main.cpp.swo | Bin 0 -> 16384 bytes src/util.h | 1 + 5 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 src/.main.cpp.swo 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 0000000000000000000000000000000000000000..144c18a5bd5a30184110696241ac3fb1a299dfbc GIT binary patch literal 16384 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