aboutsummaryrefslogtreecommitdiff
path: root/src/core_memusage.h
diff options
context:
space:
mode:
authormerge-script <fanquake@gmail.com>2024-09-17 17:14:28 +0100
committermerge-script <fanquake@gmail.com>2024-09-17 17:14:28 +0100
commit1147e72953d1f262111a4b1d5a438a8394511bc7 (patch)
tree48061825c2dced44d438b01a8a8417ef03f217f9 /src/core_memusage.h
parentfa460884406b35b0dee75af23f42e8b4c4acbebc (diff)
parent06a7df70df30879e0b691d1a252636f703b8cdfb (diff)
Merge bitcoin/bitcoin#30827: [28.x] Further backports and rc2v28.0rc2
06a7df70df30879e0b691d1a252636f703b8cdfb doc: Generate manpages (Ava Chow) 5315886bf5bb430ced1b23ebfcd0b8865b523675 build: Bump to 28.0rc2 (Ava Chow) ff95cb31da6ab6af70125b2c0b78aa976780c61e streams: remove AutoFile::Get() entirely (Pieter Wuille) 8229e981167f61e2d4c2e8b7761cba68374ea92f streams: cache file position within AutoFile (Pieter Wuille) 1b853fdb0a40064a5c75b2dae96dfe1d590de6e1 qt: Translations update (Hennadii Stepanov) 674dded8756ddf9b731f3149c66dd044090e4c8e gui: fix crash when closing wallet (furszy) d39262e5d41e92d22e020d283ddb6e4e406647b2 test: Wait for local services to update in feature_assumeutxo (Fabian Jahr) b329ed739b7311b3b47cae1ef8d576a90e0a36a1 test: add coverage for assumeUTXO honest peers disconnection (furszy) c6b5db1d591f0984cd0e6918970a9e4fc32595d3 assumeUTXO: fix peers disconnection during sync (furszy) 598415bcc1d1f8d516159a1501dda24e8d7c2ea9 test: Work around boost compilation error (MarcoFalke) Pull request description: * #30834 * #30807 * #30880 * https://github.com/bitcoin-core/gui/pull/835 * #30899 * #30884 ACKs for top commit: stickies-v: ACK 06a7df70df30879e0b691d1a252636f703b8cdfb hebasto: ACK 06a7df70df30879e0b691d1a252636f703b8cdfb, I've backported the listed PRs locally. The only merge conflict I faced was in https://github.com/bitcoin/bitcoin/pull/30807. It was trivial to resolve. Tree-SHA512: 779d734b50fdce379a20865ba30c969def028963ba51da0f497ddf1b5375e1f6166365295f226c1a07bab8be0c1aa0a6a3296fc6acd9fcf17bcc4874aac980a6
Diffstat (limited to 'src/core_memusage.h')
0 files changed, 0 insertions, 0 deletions