git://git.novaco.in / p2pool.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a2c788b b198ed6)
Merge branch 'tx_preforwarding' 8.0
authorForrest Voight <forrest@forre.st>
Thu, 18 Oct 2012 00:43:26 +0000 (20:43 -0400)
committerForrest Voight <forrest@forre.st>
Thu, 18 Oct 2012 00:43:26 +0000 (20:43 -0400)
1  2 
p2pool/main.py patch | diff1 | diff2 | blob | history
p2pool/web.py patch | diff1 | diff2 | blob | history

diff --cc p2pool/main.py
Simple merge
diff --cc p2pool/web.py
Simple merge
Peer-to-peer Novacoin mining pool