git://git.novaco.in
/
electrum-nvc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
698f8bc
24cabcb
)
Merge remote-tracking branch 'upstream/master' into clean
author
Michael Wozniak
<github@koh.ms>
Sun, 10 Nov 2013 22:00:00 +0000 (17:00 -0500)
committer
Michael Wozniak
<github@koh.ms>
Sun, 10 Nov 2013 22:00:00 +0000 (17:00 -0500)
1
2
gui/gtk.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
gui/gtk.py
Simple merge