git://git.novaco.in
/
novacoin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5e9ed1b
54b3d96
)
Merge branch 'sunny/seeding' into scott/sign_block
author
Scott Nadal
<scottnadal@gmail.com>
Sat, 24 Mar 2012 18:16:27 +0000 (18:16 +0000)
committer
Scott Nadal
<scottnadal@gmail.com>
Sat, 24 Mar 2012 18:16:27 +0000 (18:16 +0000)
1
2
src/main.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/main.cpp
Simple merge
git://git.novaco.in / novacoin.git / commitdiff