diff options
| author | fanquake <fanquake@gmail.com> | 2021-09-23 18:05:40 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-09-23 18:07:49 +0800 |
| commit | af591f2068d0363c92d9756ca39c43db85e5804c (patch) | |
| tree | 98a22dbea2a3973dd75ba211d5b63416907d9d34 /src/merkleblock.cpp | |
| parent | 97d3500601c1d28642347d014a6de1e38f53ae4e (diff) | |
| parent | 6c102a696e1f6e3316b2a90c33c5d7875298c875 (diff) | |
Merge bitcoin/bitcoin#22858: [0.21] Final changes for 0.21.2v0.21.2
6c102a696e1f6e3316b2a90c33c5d7875298c875 release: bump RC to 0 (-final) (fanquake)
f78570ef87d8dd4864ddfe67439315bd6f374edd doc: mention bech32m/BIP350 in doc/descriptors.md (Pieter Wuille)
Pull request description:
Backports:
* #22837 - doc: mention bech32m/BIP350 in doc/descriptors.md
ACKs for top commit:
laanwj:
ACK 6c102a696e1f6e3316b2a90c33c5d7875298c875
glozow:
ACK 6c102a696e1f6e3316b2a90c33c5d7875298c875 looks correct to me
jnewbery:
ACK 6c102a696e1f6e3316b2a90c33c5d7875298c875
Tree-SHA512: 8cdfee955e1abdbc6900df3d01982cb77ec57ef008b75487ac9a63d571cc21e4ae0f107849aa575d239a8662619553778955ffbebf57201de5afcd34298d57b4
Diffstat (limited to 'src/merkleblock.cpp')
0 files changed, 0 insertions, 0 deletions