Merge branch 'master' into is_on_main_chain_public2

This commit is contained in:
Andrew Poelstra 2018-03-09 14:45:31 +00:00 committed by GitHub
commit a3037bd4b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions

View File

@ -1,12 +1,12 @@
[package] [package]
name = "bitcoin" name = "bitcoin"
version = "0.11.0" version = "0.11.1"
authors = ["Andrew Poelstra <apoelstra@wpsoftware.net>"] authors = ["Andrew Poelstra <apoelstra@wpsoftware.net>"]
license = "CC0-1.0" license = "CC0-1.0"
homepage = "https://github.com/apoelstra/rust-bitcoin/" homepage = "https://github.com/rust-bitcoin/rust-bitcoin/"
repository = "https://github.com/apoelstra/rust-bitcoin/" repository = "https://github.com/rust-bitcoin/rust-bitcoin/"
documentation = "https://www.wpsoftware.net/rustdoc/bitcoin/" documentation = "https://docs.rs/bitcoin/0.11.1/secp256k1/"
description = "General purpose library for using and interoperating with Bitcoin and other cryptocurrencies." description = "General purpose library for using and interoperating with Bitcoin and other cryptocurrencies."
keywords = [ "crypto", "bitcoin" ] keywords = [ "crypto", "bitcoin" ]
readme = "README.md" readme = "README.md"