Merge pull request #2 from patricklodder/1.7.2-dev-confirms

also revert the 'clock display' back to 6 confirms
This commit is contained in:
Ross Nicoll 2014-05-21 18:03:12 +01:00
commit 574c325d6c

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/clock2.png</file>
<file alias="transaction_2">res/icons/clock4.png</file>
<file alias="transaction_1">res/icons/clock1.png</file>
<file alias="transaction_2">res/icons/clock2.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>