git.rm.cloudns.org Git - xonotic/darkplaces.git/commit

]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commit

author	Brian Bosak <webadm@elcnet.servehttp.com>
	Mon, 12 Aug 2013 21:21:46 +0000 (16:21 -0500)
committer	Brian Bosak <webadm@elcnet.servehttp.com>
	Mon, 12 Aug 2013 21:21:46 +0000 (16:21 -0500)
commit	75ef0c6d0e5856b55bf4ff13f73ea212700f8f96
tree	25a880558135f0827ec58858f99f1e9531553f6a	tree \| snapshot
parent	dd6c869d777215545797293979b442660e765b06	commit \| diff
parent	7202588da46eeb96100c1439b10499d349a6dd61	commit \| diff

Merge remote-tracking branch 'origin/divVerent/lhnet_tcp' into IDWMaster/lobby_and_chat_support

Conflicts:
console.c
lhnet.c
lhnet.h