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)
commit4b88647966a1144b5e5532fef50bbf34f9402e71
tree8076c58bc252fe5b68e42776dfe395911633be8b
parentd43fd8a038b7e5068e5db357ba7a9006da812d8a
parent448b4516ff982052e375d42059bcf0fb7e58589f
Merge branch 'dns-seed' of https://github.com/jgarzik/bitcoin
init.cpp