diff options
| author | merge-script <fanquake@gmail.com> | 2024-06-24 13:37:23 +0100 |
|---|---|---|
| committer | merge-script <fanquake@gmail.com> | 2024-06-24 13:37:23 +0100 |
| commit | 6bbfdcfb6d6a620216eb8cdb50c238113cd77e6e (patch) | |
| tree | 82e5d8bdcd504f9cad00c8af50827faeaeafc6ed /src/core_memusage.h | |
| parent | d10cf127e576a8066a417aa77d49a6c726cb16af (diff) | |
| parent | 10413ac46c07d3a45dc9d71818f59ffdb1129032 (diff) | |
Merge bitcoin/bitcoin#30319: [26.x] upnp: fix build with miniupnpc 2.2.8
10413ac46c07d3a45dc9d71818f59ffdb1129032 doc: add 30283 cherry-pick to rel notes (fanquake)
391ce775f4661d2b9faa616b5d3d0511b53b79b2 upnp: add compatibility for miniupnpc 2.2.8 (Cory Fields)
Pull request description:
Backports https://github.com/bitcoin/bitcoin/pull/30283 to the 26.x branch.
ACKs for top commit:
edilmedeiros:
ACK 10413ac46c07d3a45dc9d71818f59ffdb1129032
theuni:
ACK 10413ac46c07d3a45dc9d71818f59ffdb1129032
Tree-SHA512: 4a0f4eceefd5bbf9c97d19c4890b85963d56449856a56e6fe24161d3d6f37332de719da342d6c00ee67f2cd9434d849809a3cdc51719dc93219ec218c35a9f97
Diffstat (limited to 'src/core_memusage.h')
0 files changed, 0 insertions, 0 deletions