Skip to content

BIP141: Add P2SH-P2WPKH example and clarify block cost#376

Merged
luke-jr merged 2 commits intobitcoin:masterfrom
jl2012:bip141p2sh
Apr 23, 2016
Merged

BIP141: Add P2SH-P2WPKH example and clarify block cost#376
luke-jr merged 2 commits intobitcoin:masterfrom
jl2012:bip141p2sh

Conversation

@jl2012
Copy link
Copy Markdown
Contributor

@jl2012 jl2012 commented Apr 23, 2016

No description provided.

@jl2012 jl2012 changed the title BIP141: Add P2SH-P2WPKH example BIP141: Add P2SH-P2WPKH example and clarify block cost Apr 23, 2016
@luke-jr luke-jr merged commit cf51071 into bitcoin:master Apr 23, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants