git://git.novaco.in
/
p2pool.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8c14e24
9a6b3f5
)
Merge remote branch 'upstream/master'
author
coblee
<chocobo@alum.mit.edu>
Tue, 8 Nov 2011 18:53:58 +0000 (10:53 -0800)
committer
coblee
<chocobo@alum.mit.edu>
Tue, 8 Nov 2011 18:53:58 +0000 (10:53 -0800)
1
2
p2pool/main.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
p2pool/main.py
Simple merge
git://git.novaco.in / p2pool.git / commitdiff