GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-16 13:01:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge fd333e15a5 into merged_master (Bitcoin PR #16226)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-06 15:20:16 +00:00
commit f68fbc1a56
14 changed files with 425 additions and 385 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/interfaces/wallet.cpp
View file

@ -11,7 +11,6 @@
#include <policy/feerate.h>
#include <policy/fees.h>
#include <primitives/transaction.h>
#include <script/ismine.h>
#include <script/standard.h>
#include <support/allocators/secure.h>
#include <sync.h>
@ -20,6 +19,7 @@
#include <util/system.h>
#include <wallet/feebumper.h>
#include <wallet/fees.h>
#include <wallet/ismine.h>
#include <wallet/rpcwallet.h>
#include <wallet/load.h>
#include <wallet/wallet.h>