]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5b4d89 efd9c19)
Merge branch 'div0-stable' into IDWMaster/lobby_and_chat_support
authorBrian Bosak <webadm@elcnet.servehttp.com>
Mon, 2 Sep 2013 18:00:53 +0000 (13:00 -0500)
committerBrian Bosak <webadm@elcnet.servehttp.com>
Mon, 2 Sep 2013 18:00:53 +0000 (13:00 -0500)
Conflicts:
cl_main.c
makefile.inc

1  2 
makefile.inc patch | diff1 | diff2 | blob | history

diff --cc makefile.inc
index 2fe5e9e7c5b8864fc073255536d5f1e65a2a1a45,4254dbc5297ead91d73f66dc301eea4beec44ef9..49cb6958d88b633d1873386d7cbcc15028d8eeeb
--- 1/makefile.inc
--- 2/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 \