Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin-pull/584/head'
Browse files Browse the repository at this point in the history
  • Loading branch information
luke-jr committed Feb 12, 2018
2 parents e38387e + 824ce9d commit 0e3551c
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 12 deletions.
16 changes: 8 additions & 8 deletions README.mediawiki
Original file line number Diff line number Diff line change
Expand Up @@ -644,34 +644,34 @@ Those proposing changes should consider that ultimately consent may rest with th
| Christian Decker
| Standard
| Draft
|- style="background-color: #ffffcf"
|- style="background-color: #cfffcf"
| [[bip-0141.mediawiki|141]]
| Consensus (soft fork)
| Segregated Witness (Consensus layer)
| Eric Lombrozo, Johnson Lau, Pieter Wuille
| Standard
| Proposed
| Final
|- style="background-color: #ffcfcf"
| [[bip-0142.mediawiki|142]]
| Applications
| Address Format for Segregated Witness
| Johnson Lau
| Standard
| Withdrawn
|- style="background-color: #ffffcf"
|- style="background-color: #cfffcf"
| [[bip-0143.mediawiki|143]]
| Consensus (soft fork)
| Transaction Signature Verification for Version 0 Witness Program
| Johnson Lau, Pieter Wuille
| Standard
| Proposed
|- style="background-color: #ffffcf"
| Final
|- style="background-color: #cfffcf"
| [[bip-0144.mediawiki|144]]
| Peer Services
| Segregated Witness (Peer Services)
| Eric Lombrozo, Pieter Wuille
| Standard
| Proposed
| Final
|- style="background-color: #cfffcf"
| [[bip-0145.mediawiki|145]]
| API/RPC
Expand All @@ -686,13 +686,13 @@ Those proposing changes should consider that ultimately consent may rest with th
| Johnson Lau, Pieter Wuille
| Standard
| Draft
|- style="background-color: #ffffcf"
|- style="background-color: #cfffcf"
| [[bip-0147.mediawiki|147]]
| Consensus (soft fork)
| Dealing with dummy stack element malleability
| Johnson Lau
| Standard
| Proposed
| Final
|- style="background-color: #cfffcf"
| [[bip-0148.mediawiki|148]]
| Consensus (soft fork)
Expand Down
1 change: 1 addition & 0 deletions bip-0009/assignments.mediawiki
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ State can be defined, active, failed. Dates are in UTC.
| 1
| 2016-11-15 00:00:00
| 2017-11-15 00:00:00
| active since #481824
| -
| 2016-05-01 00:00:00
| 2017-05-01 00:00:00
Expand Down
2 changes: 1 addition & 1 deletion bip-0141.mediawiki
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Pieter Wuille <pieter.wuille@gmail.com>
Comments-Summary: No comments yet.
Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0141
Status: Proposed
Status: Final
Type: Standards Track
Created: 2015-12-21
License: PD
Expand Down
2 changes: 1 addition & 1 deletion bip-0143.mediawiki
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Pieter Wuille <pieter.wuille@gmail.com>
Comments-Summary: No comments yet.
Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0143
Status: Proposed
Status: Final
Type: Standards Track
Created: 2016-01-03
License: PD
Expand Down
2 changes: 1 addition & 1 deletion bip-0144.mediawiki
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Pieter Wuille <pieter.wuille@gmail.com>
Comments-Summary: No comments yet.
Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0144
Status: Proposed
Status: Final
Type: Standards Track
Created: 2016-01-08
License: PD
Expand Down
2 changes: 1 addition & 1 deletion bip-0147.mediawiki
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Author: Johnson Lau <jl2012@xbt.hk>
Comments-Summary: No comments yet.
Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0147
Status: Proposed
Status: Final
Type: Standards Track
Created: 2016-09-02
License: PD
Expand Down

0 comments on commit 0e3551c

Please sign in to comment.