tMerge branch 'master' of gitorious.org:electrum/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 350a4629010b5c56852e457d38f1b04c71e4c11b
DIR parent ad6c0ab2736edd2d7d2f0871a6b6a4d716441ace
HTML Author: ThomasV <thomasv@gitorious>
Date: Tue, 3 Apr 2012 16:54:31 +0200
Merge branch 'master' of gitorious.org:electrum/electrum
Conflicts:
client/electrum
Diffstat:
M client/electrum | 2 +-
M client/version.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
DIR diff --git a/client/electrum b/client/electrum
t@@ -305,7 +305,7 @@ if __name__ == '__main__':
v = line['value']
b += v
try:
- time_str = datetime.datetime.fromtimestamp( line['timestamp'])
+ time_str = str( datetime.datetime.fromtimestamp( line['timestamp']))
except:
print line['timestamp']
time_str = 'pending'
DIR diff --git a/client/version.py b/client/version.py
t@@ -1,2 +1,2 @@
-ELECTRUM_VERSION = "0.43b"
+ELECTRUM_VERSION = "0.43c"
SEED_VERSION = 4 # bump this everytime the seed generation is modified