git://git.novaco.in
/
novacoin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e7e6ae2
73aa042
)
Merge branch 'fixnullpfrom' of https://github.com/sipa/bitcoin
author
Gavin Andresen
<gavinandresen@gmail.com>
Wed, 22 Feb 2012 16:25:08 +0000 (11:25 -0500)
committer
Gavin Andresen
<gavinandresen@gmail.com>
Wed, 22 Feb 2012 16:25:08 +0000 (11:25 -0500)
1
2
src/main.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/main.cpp
Simple merge
git://git.novaco.in / novacoin.git / commitdiff