Skip to content

Commit 0e3551c

Browse files
committed
Merge remote-tracking branch 'origin-pull/584/head'
2 parents e38387e + 824ce9d commit 0e3551c

File tree

6 files changed

+13
-12
lines changed

6 files changed

+13
-12
lines changed

README.mediawiki

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -644,34 +644,34 @@ Those proposing changes should consider that ultimately consent may rest with th
644644
| Christian Decker
645645
| Standard
646646
| Draft
647-
|- style="background-color: #ffffcf"
647+
|- style="background-color: #cfffcf"
648648
| [[bip-0141.mediawiki|141]]
649649
| Consensus (soft fork)
650650
| Segregated Witness (Consensus layer)
651651
| Eric Lombrozo, Johnson Lau, Pieter Wuille
652652
| Standard
653-
| Proposed
653+
| Final
654654
|- style="background-color: #ffcfcf"
655655
| [[bip-0142.mediawiki|142]]
656656
| Applications
657657
| Address Format for Segregated Witness
658658
| Johnson Lau
659659
| Standard
660660
| Withdrawn
661-
|- style="background-color: #ffffcf"
661+
|- style="background-color: #cfffcf"
662662
| [[bip-0143.mediawiki|143]]
663663
| Consensus (soft fork)
664664
| Transaction Signature Verification for Version 0 Witness Program
665665
| Johnson Lau, Pieter Wuille
666666
| Standard
667-
| Proposed
668-
|- style="background-color: #ffffcf"
667+
| Final
668+
|- style="background-color: #cfffcf"
669669
| [[bip-0144.mediawiki|144]]
670670
| Peer Services
671671
| Segregated Witness (Peer Services)
672672
| Eric Lombrozo, Pieter Wuille
673673
| Standard
674-
| Proposed
674+
| Final
675675
|- style="background-color: #cfffcf"
676676
| [[bip-0145.mediawiki|145]]
677677
| API/RPC
@@ -686,13 +686,13 @@ Those proposing changes should consider that ultimately consent may rest with th
686686
| Johnson Lau, Pieter Wuille
687687
| Standard
688688
| Draft
689-
|- style="background-color: #ffffcf"
689+
|- style="background-color: #cfffcf"
690690
| [[bip-0147.mediawiki|147]]
691691
| Consensus (soft fork)
692692
| Dealing with dummy stack element malleability
693693
| Johnson Lau
694694
| Standard
695-
| Proposed
695+
| Final
696696
|- style="background-color: #cfffcf"
697697
| [[bip-0148.mediawiki|148]]
698698
| Consensus (soft fork)

bip-0009/assignments.mediawiki

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ State can be defined, active, failed. Dates are in UTC.
2929
| 1
3030
| 2016-11-15 00:00:00
3131
| 2017-11-15 00:00:00
32+
| active since #481824
3233
| -
3334
| 2016-05-01 00:00:00
3435
| 2017-05-01 00:00:00

bip-0141.mediawiki

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Pieter Wuille <[email protected]>
88
Comments-Summary: No comments yet.
99
Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0141
10-
Status: Proposed
10+
Status: Final
1111
Type: Standards Track
1212
Created: 2015-12-21
1313
License: PD

bip-0143.mediawiki

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Pieter Wuille <[email protected]>
77
Comments-Summary: No comments yet.
88
Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0143
9-
Status: Proposed
9+
Status: Final
1010
Type: Standards Track
1111
Created: 2016-01-03
1212
License: PD

bip-0144.mediawiki

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Pieter Wuille <[email protected]>
77
Comments-Summary: No comments yet.
88
Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0144
9-
Status: Proposed
9+
Status: Final
1010
Type: Standards Track
1111
Created: 2016-01-08
1212
License: PD

bip-0147.mediawiki

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Author: Johnson Lau <[email protected]>
66
Comments-Summary: No comments yet.
77
Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0147
8-
Status: Proposed
8+
Status: Final
99
Type: Standards Track
1010
Created: 2016-09-02
1111
License: PD

0 commit comments

Comments
 (0)