diff options
| author | Matt David <matt@netki.com> | 2016-12-02 14:37:53 -0800 |
|---|---|---|
| committer | Matt David <matt@netki.com> | 2016-12-02 14:37:53 -0800 |
| commit | 1ba95330d11e94e008548006967830e5d61925de (patch) | |
| tree | 1691a2634704c5315aa4a266581c568d8c82d897 /README.mediawiki | |
| parent | 9ec4be28087c129d057bc7fb58a3aa3085f118f7 (diff) | |
| parent | acffcfbe18810b8d50cdd08c0973bef4add2aca1 (diff) | |
| download | bips-1ba95330d11e94e008548006967830e5d61925de.tar.xz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'README.mediawiki')
| -rw-r--r-- | README.mediawiki | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/README.mediawiki b/README.mediawiki index da18d6b..ed46917 100644 --- a/README.mediawiki +++ b/README.mediawiki @@ -344,6 +344,12 @@ Those proposing changes should consider that ultimately consent may rest with th | Standard | Draft |- +| [[bip-0090.mediawiki|90]] +| Buried Deployments +| Suhas Daftuar +| Informational +| Draft +|- | [[bip-0099.mediawiki|99]] | Motivation and deployment of consensus rule changes ([soft/hard]forks) | Jorge Timón @@ -385,12 +391,12 @@ Those proposing changes should consider that ultimately consent may rest with th | Washington Y. Sanchez | Standard | Draft -|- +|- style="background-color: #ffcfcf" | [[bip-0109.mediawiki|109]] | Two million byte size limit with sigop and sighash limits | Gavin Andresen | Standard -| Draft +| Rejected |- style="background-color: #ffffcf" | [[bip-0111.mediawiki|111]] | NODE_BLOOM service bit |