From: Brian Bosak <webadm@elcnet.servehttp.com>
Date: Mon, 2 Sep 2013 18:00:53 +0000 (-0500)
Subject: Merge branch 'div0-stable' into IDWMaster/lobby_and_chat_support
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=928c2d7153355b9317f13fbfcfab093ff95f7a9c;p=xonotic%2Fdarkplaces.git

Merge branch 'div0-stable' into IDWMaster/lobby_and_chat_support

Conflicts:
	cl_main.c
	makefile.inc
---

928c2d7153355b9317f13fbfcfab093ff95f7a9c
diff --cc makefile.inc
index 2fe5e9e7,4254dbc5..49cb6958
--- a/makefile.inc
+++ b/makefile.inc
@@@ -158,11 -158,7 +158,12 @@@ OBJ_COMMON= 
  	wad.o \
  	world.o \
  	zone.o \
 -	idwmaster_gameroom.c
++
 +	lobby_gameroom.c
 +
 +OBJ_MENU= \
 +	menu.o \
 +	mvm_cmds.o
  
  OBJ_MENU= \
  	menu.o \