bitcoin/bips
1
0
Fork 0
mirror of https://github.com/bitcoin/bips.git synced 2026-02-23 15:38:22 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'bitcoin/master'

Browse Source 
Conflicts:
	README.mediawiki
This commit is contained in:
Kristov Atlas
2015-08-18 17:41:13 -04:00
parent 9a0d3bb69e a409100854
commit 0ec82c9c8f
9 changed files with 402 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
README.mediawiki
View File

@@ -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! -->