Merge branch 'dns-seed' of https://github.com/jgarzik/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Sun, 13 Mar 2011 21:15:59 +0000 (17:15 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Sun, 13 Mar 2011 21:15:59 +0000 (17:15 -0400)
1  2 
init.cpp

diff --cc init.cpp
Simple merge