From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Mon, 19 Dec 2011 21:05:15 +0000 (-0500)
Subject: Merge branch '0.4.x' into 0.5.0.x
X-Git-Tag: v0.4.0-unstable~129^2~1^2~18^2~10^2~38^2
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=f503a1486a6cbda8d0e73923fec8de3ced253b28;hp=5fe2dbd7b6a182b90128371f8e8d679d70133d6b;p=novacoin.git

Merge branch '0.4.x' into 0.5.0.x
---

diff --git a/src/net.cpp b/src/net.cpp
index e0ac2ab..50d2891 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1225,6 +1225,8 @@ void MapPort(bool /* unused fMapPort */)
 static const char *strDNSSeed[] = {
     "bitseed.xf2.org",
     "dnsseed.bluematt.me",
+    "seed.bitcoin.sipa.be",
+    "dnsseed.bitcoin.dashjr.org",
 };
 
 void ThreadDNSAddressSeed(void* parg)