summaryrefslogtreecommitdiff
path: root/README.mediawiki
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-06-22 12:09:51 +0000
committerWladimir J. van der Laan <laanwj@gmail.com>2015-06-22 12:09:51 +0000
commitb2c320f58f8d4b3155ac0b91a18398468e7bec9c (patch)
tree1fefcf0481e458d08fee4fd9ce049567199859f3 /README.mediawiki
parent8078ed4d908dbc172c8d4c0a216ec94e11edc85b (diff)
parentfca43c76b7fa871baabfd7c80765078ee1363086 (diff)
downloadbips-b2c320f58f8d4b3155ac0b91a18398468e7bec9c.tar.xz
Merge pull request #158 from maaku/bip68
Add BIP 68: Consensus-enforced transaction replacement signalled via sequence numbers
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 56f15d5..bcf13de 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -254,6 +254,12 @@ Those proposing changes should consider that ultimately consent may rest with th
| Standard
| Draft
|-
+| [[bip-0068.mediawiki|68]]
+| Consensus-enforced transaction replacement signalled via sequence numbers
+| Mark Friedenbach
+| Standard
+| Draft
+|-
| [[bip-0070.mediawiki|70]]
| Payment protocol
| Gavin Andresen