summaryrefslogtreecommitdiff
path: root/README.mediawiki
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-05-26 08:13:03 +0000
committerWladimir J. van der Laan <laanwj@gmail.com>2015-05-26 08:13:03 +0000
commitf30e1eccd5b391160866d45619adee5dcd4d9ca8 (patch)
treedbf593716eb672cfa9221c17d5cac93c2d25dbe1 /README.mediawiki
parentdeec9f13c2406ff18221fae17fd264cc5a33c1d6 (diff)
parent213e8a27a3a2eaaf44f79221a9f9f888af002801 (diff)
downloadbips-f30e1eccd5b391160866d45619adee5dcd4d9ca8.tar.xz
Merge pull request #146 from afk11/bip0090
BIP: Deterministic multi-signature P2SH addresses
Diffstat (limited to 'README.mediawiki')
-rw-r--r--README.mediawiki6
1 files changed, 6 insertions, 0 deletions
diff --git a/README.mediawiki b/README.mediawiki
index d624eb5..56f15d5 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -248,6 +248,12 @@ Those proposing changes should consider that ultimately consent may rest with th
| Standard
| Draft
|-
+| [[bip-0067.mediawiki|67]]
+| Deterministic P2SH multi-signature addresses
+| Thomas Kerin
+| Standard
+| Draft
+|-
| [[bip-0070.mediawiki|70]]
| Payment protocol
| Gavin Andresen