Merge #8990: moveonly: move coincontrol to src/wallet

1ae5839 moveonly: move `coincontrol` to `src/wallet` (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan
2016-10-21 15:30:14 +02:00
5 changed files with 7 additions and 7 deletions

View File

@@ -13,7 +13,7 @@
#include "txmempool.h"
#include "walletmodel.h"
#include "coincontrol.h"
#include "wallet/coincontrol.h"
#include "init.h"
#include "main.h" // For minRelayTxFee
#include "wallet/wallet.h"

View File

@@ -16,7 +16,7 @@
#include "walletmodel.h"
#include "base58.h"
#include "coincontrol.h"
#include "wallet/coincontrol.h"
#include "main.h" // mempool and minRelayTxFee
#include "ui_interface.h"
#include "txmempool.h"