]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ccbbec8 15d29a0)
Merge branch 'IDWMaster/lobby_and_chat_support' of git://de.git.xonotic.org/xonotic...
authorBrian Bosak <webadm@elcnet.servehttp.com>
Mon, 2 Sep 2013 03:39:33 +0000 (22:39 -0500)
committerBrian Bosak <webadm@elcnet.servehttp.com>
Mon, 2 Sep 2013 03:39:33 +0000 (22:39 -0500)

Trivial merge