msvc: Fix silent merge conflict between #13926 and #14372 part II #15407

pull ken2812221 wants to merge 1 commits into bitcoin:master from ken2812221:msvc-bitcoin-wallet-leveldb changing 1 files +3 −0
  1. ken2812221 commented at 12:12 PM on February 14, 2019: contributor

    In #15325, I added secp256k1 as a dependency of bitcoin-wallet. However, I didn't notice that leveldb is also a dependency of it.

  2. msvc: Fix silent merge conflict between #13926 and #14372 part II 3c6ef0393f
  3. fanquake added the label Windows on Feb 14, 2019
  4. fanquake added the label Build system on Feb 14, 2019
  5. fanquake commented at 1:08 PM on February 14, 2019: member

    utACK 3c6ef03

  6. MarcoFalke merged this on Feb 14, 2019
  7. MarcoFalke closed this on Feb 14, 2019

  8. MarcoFalke referenced this in commit e3b1c7a9d6 on Feb 14, 2019
  9. ken2812221 deleted the branch on Feb 14, 2019
  10. MarcoFalke commented at 2:04 PM on February 14, 2019: member

    Thanks, I am just going to merge this, since appveyor passed on this pull request.

  11. laanwj commented at 8:35 AM on February 17, 2019: member

    In #15325, I added secp256k1 as a dependency of bitcoin-wallet. However, I didn't notice that leveldb is also a dependency of it.

    This is probably something we need to fix in the future, there's afaik no architectural reason for the wallet to depend on leveldb.

  12. DrahtBot locked this on Dec 16, 2021

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-04-13 18:15 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me