]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commit
Fixed strange merge artifacts
authorBrian Bosak <webadm@elcnet.servehttp.com>
Mon, 12 Aug 2013 21:29:23 +0000 (16:29 -0500)
committerBrian Bosak <webadm@elcnet.servehttp.com>
Mon, 12 Aug 2013 21:29:23 +0000 (16:29 -0500)
commit36df679819588192daf8c579028a1ad52be4c642
treebccc8e7cf193766403c6d0dfb3f788767461ebf8
parent75ef0c6d0e5856b55bf4ff13f73ea212700f8f96
Fixed strange merge artifacts
console.c
lhnet.h