git://git.novaco.in
/
electrum-nvc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
43d9710
2bf2f76
)
Merge branch 'socks-support' into merged
author
bkkcoins
<chrissavery@gmail.com>
Fri, 21 Sep 2012 08:14:48 +0000 (15:14 +0700)
committer
bkkcoins
<chrissavery@gmail.com>
Fri, 21 Sep 2012 08:14:48 +0000 (15:14 +0700)
1
2
lib/gui_qt.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/gui_qt.py
Simple merge
git://git.novaco.in / electrum-nvc.git / commitdiff