git://git.novaco.in
/
novacoin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
16e7c05
b379bc5
)
Merge branch '0.4.x' into 0.5.x
author
Luke Dashjr
<luke-jr+git@utopios.org>
Mon, 12 Dec 2011 19:34:47 +0000 (14:34 -0500)
committer
Luke Dashjr
<luke-jr+git@utopios.org>
Mon, 12 Dec 2011 19:34:47 +0000 (14:34 -0500)
1
2
src/net.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/net.cpp
Simple merge
git://git.novaco.in / novacoin.git / commitdiff