diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2016-01-08 17:53:59 +0000 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2016-01-08 17:53:59 +0000 |
commit | b16a75072d11b367d97d2676d260a5cd6a907adf (patch) | |
tree | fc7450587063d28c00451a386d7aeaf4ce0d8713 | |
parent | 90367c065a6d58a1548f690389e2a8b8bcb1d522 (diff) | |
download | bips-b16a75072d11b367d97d2676d260a5cd6a907adf.tar.xz |
Assign BIP 141
-rw-r--r-- | README.mediawiki | 6 | ||||
-rw-r--r-- | bip-0141.mediawiki (renamed from bip-codeshark-jl2012-segwit.mediawiki) | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/README.mediawiki b/README.mediawiki index b45c17a..af982a5 100644 --- a/README.mediawiki +++ b/README.mediawiki @@ -379,6 +379,12 @@ Those proposing changes should consider that ultimately consent may rest with th | Suhas Daftuar | Standard | Draft +|- +| [[bip-0141.mediawiki|141]] +| Segregated Witness (Consensus layer) +| Eric Lombrozo, Johnson Lau, and Pieter Wuille +| Standard +| Draft |} <!-- IMPORTANT! See the instructions at the top of this page, do NOT JUST add BIPs here! --> diff --git a/bip-codeshark-jl2012-segwit.mediawiki b/bip-0141.mediawiki index dd81c1d..ac44d87 100644 --- a/bip-codeshark-jl2012-segwit.mediawiki +++ b/bip-0141.mediawiki @@ -1,5 +1,5 @@ <pre> - BIP: x + BIP: 141 Title: Segregated Witness (Consensus layer) Author: Eric Lombrozo <elombrozo@gmail.com> Johnson Lau <jl2012@xbt.hk> |