commit 1f170ff1ce5cf9b9b55b3a09c0840e237432477c
Merge: 1981657e e7e8858a
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Sat Sep 17 16:08:08 2011 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Sat Sep 17 16:08:08 2011 +0000

    Merge from trunk.

    Subversion-branch: /branches/v2-branch
    Subversion-revision: 2381

 src/doom/d_main.c |   8 +-
 src/net_query.c   | 276 ++++++++++++++++++++++++++++++++++--------------------
 src/net_query.h   |  10 +-
 3 files changed, 181 insertions(+), 113 deletions(-)

diff --cc src/net_query.c
index ae56dea6,0262791b..06391a14
--- a/src/net_query.c
+++ b/src/net_query.c
@@@ -22,9 -22,8 +22,10 @@@
  //     Querying servers to find their current status.
  //

 +#include <stdio.h>
  #include <stdarg.h>
  #include <stdlib.h>
++#include <string.h>

  #include "i_system.h"
  #include "i_timer.h"