diff options
| author | Kristov Atlas <kristovatlas@gmail.com> | 2015-08-18 17:41:13 -0400 |
|---|---|---|
| committer | Kristov Atlas <kristovatlas@gmail.com> | 2015-08-18 17:41:13 -0400 |
| commit | 0ec82c9c8f19f645afc70cef40e2ae53d966a6dd (patch) | |
| tree | ec97274fef7b50165b995e945eb2f87405da63c4 /README.mediawiki | |
| parent | 9a0d3bb69e97f6bb3721ff23ee06f0402e2181d0 (diff) | |
| parent | a409100854f52454b0ba30f98f8f5e585695ec0e (diff) | |
Merge remote-tracking branch 'bitcoin/master'
Conflicts:
README.mediawiki
Diffstat (limited to 'README.mediawiki')
| -rw-r--r-- | README.mediawiki | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/README.mediawiki b/README.mediawiki index 56c8bd1..1f8ef4d 100644 --- a/README.mediawiki +++ b/README.mediawiki @@ -254,9 +254,15 @@ Those proposing changes should consider that ultimately consent may rest with th | Standard | Draft |- +<<<<<<< HEAD | [[bip-0069.mediawiki|69]] | Lexicographical Indexing of Transaction Inputs and Outputs | Kristov Atlas +======= +| [[bip-0068.mediawiki|68]] +| Consensus-enforced transaction replacement signalled via sequence numbers +| Mark Friedenbach +>>>>>>> bitcoin/master | Standard | Draft |- @@ -283,6 +289,12 @@ Those proposing changes should consider that ultimately consent may rest with th | Stephen Pair | Standard | Draft +|- +| [[bip-0101.mediawiki|101]] +| Increase maximum block size +| Gavin Andresen +| Standard +| Draft |} <!-- IMPORTANT! See the instructions at the top of this page, do NOT JUST add BIPs here! --> |