From: CryptoManiac <balthazar@yandex.ru>
Date: Sun, 3 Aug 2014 18:37:41 +0000 (+0400)
Subject: Merge remote-tracking branch 'remotes/origin_project/master'
X-Git-Tag: v0.4.4.6-nvc-update8~1^2~1^2~3
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=26dd6dcf4dd0a257d867b9bcea631633096b5bfe;hp=-c;p=novacoin.git

Merge remote-tracking branch 'remotes/origin_project/master'
---

26dd6dcf4dd0a257d867b9bcea631633096b5bfe
diff --combined src/wallet.h
index f9a2983,26c49ea..9a41935
--- a/src/wallet.h
+++ b/src/wallet.h
@@@ -200,6 -200,7 +200,7 @@@ public
      bool GetStakeWeight(const CKeyStore& keystore, uint64& nMinWeight, uint64& nMaxWeight, uint64& nWeight);
      void GetStakeWeightFromValue(const int64& nTime, const int64& nValue, uint64& nWeight);
      bool CreateCoinStake(const CKeyStore& keystore, unsigned int nBits, int64 nSearchInterval, CTransaction& txNew, CKey& key);
+     bool MergeCoins(const int64& nAmount, const int64& nMaxValue, const int64& nOutputValue, list<uint256>& listMerged);
  
      std::string SendMoney(CScript scriptPubKey, int64 nValue, CWalletTx& wtxNew, bool fAskFee=false);
      std::string SendMoneyToDestination(const CTxDestination &address, int64 nValue, CWalletTx& wtxNew, bool fAskFee=false);
@@@ -460,8 -461,6 +461,8 @@@ public
          fWatchCreditCached = false;
          fAvailableCreditCached = false;
          fAvailableWatchCreditCached = false;
 +        fImmatureCreditCached = false;
 +        fImmatureWatchCreditCached = false;
          fChangeCached = false;
          nDebitCached = 0;
          nWatchDebitCached = 0;
@@@ -469,8 -468,6 +470,8 @@@
          nWatchCreditCached = 0;
          nAvailableCreditCached = 0;
          nAvailableWatchCreditCached = 0;
 +        nImmatureCreditCached = 0;
 +        nImmatureWatchCreditCached = 0;
          nChangeCached = 0;
          nOrderPos = -1;
      }