git://git.novaco.in
/
p2pool.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
538af73
0d785d3
)
Merge branch 'master' of git://github.com/hardcpp/p2pool into hardcpp-master2
author
Forrest Voight
<forrest@forre.st>
Thu, 25 Apr 2013 04:24:29 +0000 (
00:24
-0400)
committer
Forrest Voight
<forrest@forre.st>
Thu, 25 Apr 2013 04:24:29 +0000 (
00:24
-0400)
Conflicts:
README.md
1
2
README.md
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
README.md
Simple merge
git://git.novaco.in / p2pool.git / commitdiff