aboutsummaryrefslogtreecommitdiffstats
path: root/code/q3_ui
diff options
context:
space:
mode:
authortma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2007-08-28 16:42:13 +0000
committertma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2007-08-28 16:42:13 +0000
commit04fc4656c928d58cdbbc60c605c5036564919ff4 (patch)
treea69fe4300fe993a4983dc57c9aeecd68c23faaf3 /code/q3_ui
parentf1ea2218d313ec44da8718529a8603616ae68619 (diff)
downloadioquake3-aero-04fc4656c928d58cdbbc60c605c5036564919ff4.tar.gz
ioquake3-aero-04fc4656c928d58cdbbc60c605c5036564919ff4.zip
* Merge win_net.c and unix_net.c
+ Move win32/win_net.c to qcommon/net_ip.c and make it portable + Remove unix_net.c, but incorporate its revision history into win_net.c + Remove all IPX support -- this remains compatible with existing mods + This change also inadvertently gets us SOCKS support on non-Windows platforms git-svn-id: svn://svn.icculus.org/quake3/trunk@1139 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/q3_ui')
-rw-r--r--code/q3_ui/ui_servers2.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/code/q3_ui/ui_servers2.c b/code/q3_ui/ui_servers2.c
index 877fa00..57c76ab 100644
--- a/code/q3_ui/ui_servers2.c
+++ b/code/q3_ui/ui_servers2.c
@@ -142,7 +142,6 @@ static char* gamenames[] = {
static char* netnames[] = {
"???",
"UDP",
- "IPX",
NULL
};