git://git.novaco.in
/
novacoin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
46aa2a6
db9f2e0
)
Merge branch 'nodosbip16' of https://github.com/sipa/bitcoin
author
Gavin Andresen
<gavinandresen@gmail.com>
Mon, 27 Feb 2012 20:47:27 +0000 (15:47 -0500)
committer
Gavin Andresen
<gavinandresen@gmail.com>
Mon, 27 Feb 2012 20:47:27 +0000 (15:47 -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