From 9f5b3fece3c0ff683150c6f1069e7eb947239ede Mon Sep 17 00:00:00 2001
From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 16 Mar 2014 00:06:53 +0000
Subject: [PATCH] changed dpmaster.deathmask.net ip4 address, added ip6 address

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12058 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=a3c1266f29afbcf0794252a5ea2f8d0ab6820307
---
 netconn.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/netconn.c b/netconn.c
index 5f256cd9..82717308 100755
--- a/netconn.c
+++ b/netconn.c
@@ -45,10 +45,11 @@ static cvar_t sv_masters [] =
 	{CVAR_SAVE, "sv_master3", "", "user-chosen master server 3"},
 	{CVAR_SAVE, "sv_master4", "", "user-chosen master server 4"},
 	{0, "sv_masterextra1", "69.59.212.88", "ghdigital.com - default master server 1 (admin: LordHavoc)"}, // admin: LordHavoc
-	{0, "sv_masterextra2", "64.22.107.125", "dpmaster.deathmask.net - default master server 2 (admin: Willis)"}, // admin: Willis
+	{0, "sv_masterextra2", "107.161.23.68", "dpmaster.deathmask.net - default master server 2 (admin: Willis)"}, // admin: Willis
 	{0, "sv_masterextra3", "92.62.40.73", "dpmaster.tchr.no - default master server 3 (admin: tChr)"}, // admin: tChr
 #ifdef SUPPORTIPV6
 	{0, "sv_masterextra4", "[2a03:4000:2:225::51:334d]:27950", "dpmaster.sudo.rm-f.org - default master server 4 (admin: divVerent)"}, // admin: divVerent
+	{0, "sv_masterextra5", "[2604:180::4ac:98c1]:27950", "dpmaster.deathmask.net - default master server 5 ipv6 address of dpmaster.deathmask.net (admin: Willis)"}, // admin: Willis
 #endif
 	{0, NULL, NULL, NULL}
 };
-- 
2.39.5