Merge pull request from jl2012/patch-12

BIP142: Deferred
This commit is contained in:
Luke-Jr 2016-03-16 18:22:52 +00:00
commit 3979dbd6da
2 changed files with 2 additions and 2 deletions

@ -474,7 +474,7 @@ Those proposing changes should consider that ultimately consent may rest with th
| Address Format for Segregated Witness
| Johnson Lau
| Standard
| Draft
| Deferred
|-
| [[bip-0143.mediawiki|143]]
| Transaction Signature Verification for Version 0 Witness Program

@ -2,7 +2,7 @@
BIP: 142
Title: Address Format for Segregated Witness
Author: Johnson Lau <jl2012@xbt.hk>
Status: Draft
Status: Deferred
Type: Standards Track
Created: 2015-12-24
</pre>