Merge branch 'master' of github.com:spesmilo/electrum

2013-02-22 14:26:22 +01:00 · 2013-02-22 14:26:22 +01:00 · 8a8aeb4567
parent a1a5886e57 95f23ec1ea
commit 8a8aeb4567
1 changed files with 1 additions and 0 deletions
--- a/1
+++ b/1
@ -566,6 +566,7 @@ if __name__ == '__main__':

    if cmd == 'history':
        import datetime
+        balance = 0
        for item in wallet.get_tx_history():
            tx_hash, conf, is_mine, value, fee, balance, timestamp = item
            try: