Skip to content

Commit 2853268

Browse files
authored
Merge pull request bitcoin#973 from ysangkok/expire-bip-0114
Reject 114 (expired)
2 parents 94073de + 3711a82 commit 2853268

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

README.mediawiki

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -546,13 +546,13 @@ Those proposing changes should consider that ultimately consent may rest with th
546546
| Thomas Kerin, Mark Friedenbach
547547
| Standard
548548
| Final
549-
|-
549+
|- style="background-color: #ffcfcf"
550550
| [[bip-0114.mediawiki|114]]
551551
| Consensus (soft fork)
552552
| Merkelized Abstract Syntax Tree
553553
| Johnson Lau
554554
| Standard
555-
| Draft
555+
| Rejected
556556
|- style="background-color: #ffcfcf"
557557
| [[bip-0115.mediawiki|115]]
558558
| Consensus (soft fork)

bip-0114.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-0114
8-
Status: Draft
8+
Status: Rejected
99
Type: Standards Track
1010
Created: 2016-04-02
1111
License: PD

0 commit comments

Comments
 (0)