Browse Source

Various branding changes and some copyrights

pull/47/head
Jonathan "Duke" Leto 7 years ago
parent
commit
8774b1031c
  1. 5
      contrib/devtools/README.md
  2. 2
      doc/wallet-backup.md
  3. 2
      qa/rpc-tests/test_framework/mininode.py
  4. BIN
      src/.main.cpp.swo
  5. 1
      src/util.h

5
contrib/devtools/README.md

@ -1,8 +1,7 @@
Contents # Contents
===========
This directory contains tools for developers working on this repository. 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. A small script to automate merging pull-requests securely and sign them with GPG.

2
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. 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` ### Using `backupwallet`

2
qa/rpc-tests/test_framework/mininode.py

@ -38,7 +38,7 @@ MY_SUBVERSION = "/python-mininode-tester:0.0.1/"
MAX_INV_SZ = 50000 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 # Keep our own socket map for asyncore, so that we can track disconnects
# ourselves (to workaround an issue with closing an asyncore socket when # ourselves (to workaround an issue with closing an asyncore socket when

BIN
src/.main.cpp.swo

Binary file not shown.

1
src/util.h

@ -1,5 +1,6 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin Core developers // Copyright (c) 2009-2014 The Bitcoin Core developers
// Copyright (c) 2017 The Hush developers
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.

Loading…
Cancel
Save