diff options
| author | W. J. van der Laan <laanwj@protonmail.com> | 2021-09-08 17:19:42 +0200 |
|---|---|---|
| committer | W. J. van der Laan <laanwj@protonmail.com> | 2021-09-08 17:20:00 +0200 |
| commit | 03f14227862041650771c4e399560683b291a28e (patch) | |
| tree | ad3ebbaf0ec6a5ca84f7d1a0ddd1b8d577b8a167 /libbitcoinconsensus.pc.in | |
| parent | fbf498d26bd25f65777930bbe44c1630bcec7dcc (diff) | |
| parent | 303bc8a0697fda00f21173dc9ae863357adac793 (diff) | |
Merge bitcoin/bitcoin#22857: [22.x] Backports
303bc8a0697fda00f21173dc9ae863357adac793 guix/prelude: Override VERSION with FORCE_VERSION (Carl Dong)
0640bf5c82e5841911b1d8288aad66e872ed3183 doc: mention bech32m/BIP350 in doc/descriptors.md (Pieter Wuille)
Pull request description:
Backports:
* #22847 - guix/prelude: Override VERSION with FORCE_VERSION
* #22837 - doc: mention bech32m/BIP350 in doc/descriptors.md
Theses are both minor enough that they would not require and rc4.
ACKs for top commit:
laanwj:
ACK 303bc8a0697fda00f21173dc9ae863357adac793
Tree-SHA512: faac095f71abb537f1d2a338e4f79f8389be2362eec0841e3fb47aaee731ce242856db461f89351c2ca4e1129a3afdd49c3e918a7bf22af3e4d2f7deaff48ad8
Diffstat (limited to 'libbitcoinconsensus.pc.in')
0 files changed, 0 insertions, 0 deletions