]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/itemstime
authorterencehill <piuntn@gmail.com>
Fri, 6 Jan 2012 15:25:38 +0000 (16:25 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 6 Jan 2012 15:25:38 +0000 (16:25 +0100)
commitfbcbf08f083a9ab14b947849342f495f05ac9b56
tree7c18302c7da250e85dff244b4b89d3f9afff12e5
parent6e0ac89b3f58dbf7d1b0edc7e62968b5841ee59c
parentf2e0cd812c7c3d3cf1bba8e0b44d123eec048638
Merge branch 'master' into terencehill/itemstime
qcsrc/client/hud.qc
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh