git://git.novaco.in
/
electrum-nvc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a1daba6
a587205
)
Merge branch 'master' of git://github.com/spesmilo/electrum
author
ThomasV
<thomasv@gitorious>
Fri, 25 Apr 2014 08:16:11 +0000 (10:16 +0200)
committer
ThomasV
<thomasv@gitorious>
Fri, 25 Apr 2014 08:16:11 +0000 (10:16 +0200)
1
2
gui/qt/main_window.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
gui/qt/main_window.py
Simple merge