diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2016-02-27 06:11:04 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2016-02-27 06:11:37 +0000 |
| commit | e5daa2e2aef61f0b9441d19f0b67015f426c6056 (patch) | |
| tree | 90a095dcd23c8a74cb605f55e224a902cba75a06 /contrib/README.md | |
| parent | 5c70a6d6d15cc301b76558f708948c375fe63ccb (diff) | |
| parent | 317462123f8e41fd7dd967ab907e59ddffb19898 (diff) | |
| download | bitcoin-e5daa2e2aef61f0b9441d19f0b67015f426c6056.tar.xz | |
Merge branch 'master' into depends_curl
Diffstat (limited to 'contrib/README.md')
| -rw-r--r-- | contrib/README.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/README.md b/contrib/README.md index 125594312b..b6e572102a 100644 --- a/contrib/README.md +++ b/contrib/README.md @@ -11,10 +11,10 @@ Repository Tools ### [Developer tools](/contrib/devtools) ### Specific tools for developers working on this repository. -Contains the script `github-merge.sh` for merging github pull requests securely and signing them using GPG. +Contains the script `github-merge.py` for merging github pull requests securely and signing them using GPG. ### [Verify-Commits](/contrib/verify-commits) ### -Tool to verify that every merge commit was signed by a developer using the above `github-merge.sh` script. +Tool to verify that every merge commit was signed by a developer using the above `github-merge.py` script. ### [Linearize](/contrib/linearize) ### Construct a linear, no-fork, best version of the blockchain. |