aboutsummaryrefslogtreecommitdiff
path: root/depends
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-11-06 12:24:37 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2015-11-06 14:08:06 +0100
commit6c31ac019f1b2b5181884de742317efda706e2f0 (patch)
tree88206ecfb792e93fd346432e7ee7ae6f6a7c5280 /depends
parentdf616ae43ed4d9227f0b52b09ebe4e9eb4bb49cf (diff)
parentaf6edac0bd637c07a9eb2cbb0dd1498b3593f801 (diff)
downloadbitcoin-6c31ac019f1b2b5181884de742317efda706e2f0.tar.xz
Merge pull request #6825
af6edac *: alias -h for --help (Daniel Cousens) 131d7f9 Change URLs to https in debian/control (Matt Corallo) 7ce2c91 Update debian/changelog and slight tweak to debian/control (Matt Corallo) 4fbfebe Correct spelling mistakes in doc folder (Mitchell Cash) e42bf16 Clarification of unit test build instructions. (Eric Lombrozo) 54f9dee Update bluematt-key, the old one is long-since revoked (Matt Corallo) bfc6154 [Trivial] Fixed typo when referring to a previous section in depends/README.md [skip ci] (Chris Kleeschulte) 9e45157 build: disable -Wself-assign (Wladimir J. van der Laan) 33d6825 Bugfix: Allow mining on top of old tip blocks for testnet (fixes testnet-in-a-box use case) (Luke Dashjr) 87a797a build: Remove dependency of bitcoin-cli on secp256k1 (Wladimir J. van der Laan) a33cd5b [trivial] Fix rpc message "help generate" (MarcoFalke) 6fd0019 Drop "with minimal dependencies" from description (Zak Wilcox) 2394f4d Split bitcoin-tx into its own package (Zak Wilcox) 1e672ae Include bitcoin-tx binary on Debian/Ubuntu (Zak Wilcox) b3eaa30 [Qt] Raise debug window when requested (MarcoFalke) 01878c9 Fix locking in GetTransaction. (Alex Morcos) 9b9acc2 Fix spelling of Qt (Diego Viola)
Diffstat (limited to 'depends')
-rw-r--r--depends/README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/depends/README.md b/depends/README.md
index 2dc0b9e47e..d85e652c60 100644
--- a/depends/README.md
+++ b/depends/README.md
@@ -13,7 +13,7 @@ For example:
make HOST=x86_64-w64-mingw32 -j4
A prefix will be generated that's suitable for plugging into Bitcoin's
-configure. In the above example, a dir named i686-w64-mingw32 will be
+configure. In the above example, a dir named x86_64-w64-mingw32 will be
created. To use it for Bitcoin:
./configure --prefix=`pwd`/depends/x86_64-w64-mingw32