Merge remote-tracking branch 'bitcoin.org/master' into generatingtxes

Conflicts:
	_includes/references.md
This commit is contained in:
David A. Harding 2014-06-09 14:04:23 -04:00
commit ba1a33e712
No known key found for this signature in database
GPG key ID: 4B29C30FF29EC4B7
25 changed files with 928 additions and 94 deletions

View file

@ -36,6 +36,7 @@ change output:
change outputs: change output
child key:
child keys: child key
child private and public keys: child key
child public key:
child public keys: child public key
coinbase: coinbase transaction
@ -122,7 +123,9 @@ p2pkh:
p2sh:
p2sh multisig:
parent chain code:
parent key:
parent private key:
parent private and public keys: parent key
parent public key:
payment protocol:
"payment protocol's": payment protocol