summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2016-01-08 17:56:02 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2016-01-08 17:56:02 +0000
commit1c879abccd4308006a565bc26d0ee58d13b6541a (patch)
tree4d42d7a232e78b7bdb8d211838ffd3afc3fbc729
parentc2d3488c026f074fbdc2ac989de484bc5fc33456 (diff)
downloadbips-1c879abccd4308006a565bc26d0ee58d13b6541a.tar.xz
Assign BIP 142
-rw-r--r--README.mediawiki6
-rw-r--r--bip-0142.mediawiki (renamed from bip-segwitaddress.mediawiki)2
2 files changed, 7 insertions, 1 deletions
diff --git a/README.mediawiki b/README.mediawiki
index b45c17a..a895342 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-0142.mediawiki|142]]
+| Address Formats for Witness Program
+| Johnson Lau
+| Standard
+| Draft
|}
<!-- IMPORTANT! See the instructions at the top of this page, do NOT JUST add BIPs here! -->
diff --git a/bip-segwitaddress.mediawiki b/bip-0142.mediawiki
index f92e368..7efeca7 100644
--- a/bip-segwitaddress.mediawiki
+++ b/bip-0142.mediawiki
@@ -1,5 +1,5 @@
<pre>
- BIP: x
+ BIP: 142
Title: Address Formats for Witness Program
Author: Johnson Lau <jl2012@xbt.hk>
Status: Draft