]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 35a1503 a609672)
Merge branch 'div0-stable' into IDWMaster/lobby_and_chat_support IDWMaster/lobby_and_chat_support
authorBrian Bosak <webadm@elcnet.servehttp.com>
Sun, 15 Sep 2013 01:24:02 +0000 (20:24 -0500)
committerBrian Bosak <webadm@elcnet.servehttp.com>
Sun, 15 Sep 2013 01:24:02 +0000 (20:24 -0500)

Trivial merge