diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2016-04-23 20:02:53 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2016-04-23 20:02:53 +0000 |
| commit | 5f697ea543e8ffcd9bb5cd42e9e373ee5791c1cc (patch) | |
| tree | 79899b5b1149dbc1c8669e31d8c630996287dfd7 /README.mediawiki | |
| parent | 2fa7fb9b5cf9a4dbe2affe44267014fc486cbcf6 (diff) | |
| parent | cf51071ccd4a4e4086a3f8a3fbbb064a30bd8bcb (diff) | |
| download | bips-5f697ea543e8ffcd9bb5cd42e9e373ee5791c1cc.tar.xz | |
Merge branch 'master' into segwit_gbt_updates_20160330
Diffstat (limited to 'README.mediawiki')
| -rw-r--r-- | README.mediawiki | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/README.mediawiki b/README.mediawiki index 92ca9f9..974870e 100644 --- a/README.mediawiki +++ b/README.mediawiki @@ -404,6 +404,12 @@ Those proposing changes should consider that ultimately consent may rest with th | Standard | Draft |- +| [[bip-0114.mediawiki|114]] +| Merkelized Abstract Syntax Tree +| Johnson Lau +| Standard +| Draft +|- | [[bip-0120.mediawiki|120]] | Proof of Payment | Kalle Rosenbaum |