diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-02-04 11:05:57 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-02-04 11:05:59 -0500 |
| commit | 6a5feb7d821f1d5a3c0c1fc808ab8707f581ea76 (patch) | |
| tree | 690ef726cf824431500a66f36c1f7a1f1f9e8eb7 /depends/description.md | |
| parent | ebc6542d982c5fb7ad965ce3b365800a44e0e635 (diff) | |
| parent | bef8fdd6e2293efdaf05f804a8cff69380c8665e (diff) | |
| download | bitcoin-6a5feb7d821f1d5a3c0c1fc808ab8707f581ea76.tar.xz | |
Merge #15325: msvc: Fix silent merge conflict between #13926 and #14372
bef8fdd6e2 msvc: Fix silent merge conflict between #13926 and #14372 (ken2812221)
Pull request description:
The bitcoin-wallet.exe would have to link with libsecp256k1 after we build libsecp256k1 in project.
Tree-SHA512: cb3fafa301f39121f5d26ac8ac6009c9665fcad1061dbf14ba013104870abe5413ac57c97c97df12b6ba2ad709b776c51aeec20d41f3ae01d3460a5e18f40eec
Diffstat (limited to 'depends/description.md')
0 files changed, 0 insertions, 0 deletions