]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commit
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)
commit928c2d7153355b9317f13fbfcfab093ff95f7a9c
treedb85bcfaee8a04f4022ea5531044e03539c92937
parentd5b4d8957af61636b7129fade248ceab19e92c50
parentefd9c1910e18b4fd0f109152a32390d89a26caad
Merge branch 'div0-stable' into IDWMaster/lobby_and_chat_support

Conflicts:
cl_main.c
makefile.inc
makefile.inc