]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/arena_and_ca_fixes
authorterencehill <piuntn@gmail.com>
Fri, 6 Jan 2012 23:32:48 +0000 (00:32 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 6 Jan 2012 23:32:48 +0000 (00:32 +0100)
commit0978758a17b0827248c7550927ac01d736f20b08
tree4e98a7f493bbf546d9231cb8fe9b63903e778b2a
parent9afb79df450db10a80cd5685618543f7370ddf6d
parentf2e0cd812c7c3d3cf1bba8e0b44d123eec048638
Merge branch 'master' into terencehill/arena_and_ca_fixes
qcsrc/server/cl_client.qc