RanchiMall/flo-electrum
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitorious.org:electrum/electrum

Browse Source 
Conflicts:
	client/electrum
This commit is contained in:
ThomasV 2012-04-03 16:54:31 +02:00
commit 350a462901
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/electrum
View File

@ -305,7 +305,7 @@ if __name__ == '__main__':
v = line['value'] v = line['value']
b += v b += v
try: try:
time_str = datetime.datetime.fromtimestamp( line['timestamp']) time_str = str( datetime.datetime.fromtimestamp( line['timestamp']))
except: except:
print line['timestamp'] print line['timestamp']
time_str = 'pending' time_str = 'pending'

2
client/version.py
View File

@ -1,2 +1,2 @@
ELECTRUM_VERSION = "0.43b" ELECTRUM_VERSION = "0.43c"
SEED_VERSION = 4 # bump this everytime the seed generation is modified SEED_VERSION = 4 # bump this everytime the seed generation is modified