git://git.novaco.in
/
electrum-nvc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cd1f4a6
128dfe3
)
Merge branch 'master' of gitorious.org:electrum/electrum
author
ThomasV
<thomasv@gitorious>
Thu, 17 Nov 2011 00:56:28 +0000 (
03:56
+0300)
committer
ThomasV
<thomasv@gitorious>
Thu, 17 Nov 2011 00:56:28 +0000 (
03:56
+0300)
1
2
client/electrum.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
client/electrum.py
Simple merge