git://git.novaco.in
/
electrum-nvc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a3830e5
2984c3d
)
Merge branch 'master' of gitorious.org:electrum/electrum
author
Julian Tosh
<Julian@Tosh.us>
Sat, 7 Jul 2012 13:41:16 +0000 (06:41 -0700)
committer
Julian Tosh
<Julian@Tosh.us>
Sat, 7 Jul 2012 13:41:16 +0000 (06:41 -0700)
1
2
lib/wallet.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/wallet.py
Simple merge