Skip to content

Conversation

@fanquake
Copy link
Member

fanquake added 2 commits June 29, 2022 16:35
47f0a2d26f Merge bitcoin-core/minisketch#66: msvc: remove direct Bitcoin Core `compat.h` include
64f17584c7 msvc: remove Core compat.h include
a223557ce1 Merge bitcoin-core/minisketch#65: Update broken links
127f7763e8 Update broken links

git-subtree-dir: src/minisketch
git-subtree-split: 47f0a2d26f6ca0f6ab3ba5e72064a9d28745de77
Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK dc375e5, I have reviewed the code and it looks OK, I agree it can be merged.

@achow101
Copy link
Member

ACK dc375e5

Diff matches upstream

@achow101 achow101 merged commit 5bc10b3 into bitcoin:master Jun 29, 2022
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Jun 29, 2022
28a28a0 Squashed 'src/minisketch/' changes from 7eeb778fef..47f0a2d26f (fanquake)

Pull request description:

  Contains:
  * bitcoin-core/minisketch#65
  * bitcoin-core/minisketch#66

  Required for bitcoin#25493.

ACKs for top commit:
  achow101:
    ACK dc375e5
  hebasto:
    ACK dc375e5, I have reviewed the code and it looks OK, I agree it can be merged.

Tree-SHA512: fbcd6cdc551770ff67d1df65ab171ce43c9eb7e7668da76da5c5b06865ed550527abcff661741a86c1535018a85a165619ff94ae3e6c7a695374b6c4f843c5ca
@fanquake fanquake deleted the update_minisketch_subtree branch June 30, 2022 08:07
@bitcoin bitcoin locked and limited conversation to collaborators Jun 30, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants