diff options
| author | Luke-Jr <luke_github1@dashjr.org> | 2016-03-16 18:22:52 +0000 |
|---|---|---|
| committer | Luke-Jr <luke_github1@dashjr.org> | 2016-03-16 18:22:52 +0000 |
| commit | 3979dbd6daf30d55d7bb115ebdc6228b8eec4b78 (patch) | |
| tree | 026868920d105cf27f9fa9af5cb813ca02a32672 | |
| parent | 97d2f023a4f7b9e48ecc5e3d1c4dcd3a47b003b8 (diff) | |
| parent | 3f586626d5b4b8eaf075c95dfeba51494dbb021b (diff) | |
| download | bips-3979dbd6daf30d55d7bb115ebdc6228b8eec4b78.tar.xz | |
Merge pull request #355 from jl2012/patch-12
BIP142: Deferred
| -rw-r--r-- | README.mediawiki | 2 | ||||
| -rw-r--r-- | bip-0142.mediawiki | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/README.mediawiki b/README.mediawiki index 02a5a76..a5eb68f 100644 --- a/README.mediawiki +++ b/README.mediawiki @@ -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 diff --git a/bip-0142.mediawiki b/bip-0142.mediawiki index ff831cb..bb60265 100644 --- a/bip-0142.mediawiki +++ b/bip-0142.mediawiki @@ -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> |