Merge pull request #502 from patricklodder/1.7-dev-3-req-conf

3 'required' confirmations for Qt
This commit is contained in:
langerhans 2014-05-04 16:43:27 +02:00
commit 9b3def818a
2 changed files with 3 additions and 3 deletions

View file

@ -13,8 +13,8 @@
<file alias="transaction_0">res/icons/transaction0.png</file>
<file alias="transaction_confirmed">res/icons/transaction2.png</file>
<file alias="transaction_conflicted">res/icons/transaction_conflicted.png</file>
<file alias="transaction_1">res/icons/clock1.png</file>
<file alias="transaction_2">res/icons/clock2.png</file>
<file alias="transaction_1">res/icons/clock2.png</file>
<file alias="transaction_2">res/icons/clock4.png</file>
<file alias="transaction_3">res/icons/clock3.png</file>
<file alias="transaction_4">res/icons/clock4.png</file>
<file alias="transaction_5">res/icons/clock5.png</file>

View file

@ -79,7 +79,7 @@ public:
};
/** Number of confirmation recommended for accepting a transaction */
static const int RecommendedNumConfirmations = 6;
static const int RecommendedNumConfirmations = 3;
TransactionRecord():
hash(), time(0), type(Other), address(""), debit(0), credit(0), idx(0)