git://git.novaco.in / novacoin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5dc0900 10ba0a3)
Merge branch 'keepnode' of https://github.com/TheBlueMatt/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 16 Jan 2012 21:45:43 +0000 (16:45 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 16 Jan 2012 21:45:43 +0000 (16:45 -0500)
1  2 
src/net.cpp patch | diff1 | diff2 | blob | history
src/netbase.cpp patch | diff1 | diff2 | blob | history

diff --cc src/net.cpp
Simple merge
diff --cc src/netbase.cpp
Simple merge
Novacoin client