diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-01-16 22:27:59 -0500 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-01-16 22:27:59 -0500 |
| commit | 70550ed81be022c81826791a75dd1567db1d667b (patch) | |
| tree | 88769f755450ae90c483066574ef572397c6f846 /src/wallet.h | |
| parent | 5df96269d30ec57e69676e6937b45b3608df98ac (diff) | |
| parent | 948072c39f913d1ebe43b3b46234f9d7a0d00427 (diff) | |
| download | bitcoin-70550ed81be022c81826791a75dd1567db1d667b.tar.xz | |
Merge branch '0.4.x' into 0.5.0.x
Diffstat (limited to 'src/wallet.h')
| -rw-r--r-- | src/wallet.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/wallet.h b/src/wallet.h index ca7cf67317..f81b2444d6 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -86,7 +86,6 @@ public: bool CreateTransaction(const std::vector<std::pair<CScript, int64> >& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet); bool CreateTransaction(CScript scriptPubKey, int64 nValue, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet); bool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey); - bool BroadcastTransaction(CWalletTx& wtxNew); std::string SendMoney(CScript scriptPubKey, int64 nValue, CWalletTx& wtxNew, bool fAskFee=false); std::string SendMoneyToBitcoinAddress(const CBitcoinAddress& address, int64 nValue, CWalletTx& wtxNew, bool fAskFee=false); |