]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - sound/weapons/shotgun_melee.ogg
Merge branch 'master' into terencehill/newpanelhud-dom_points
authorterencehill <piuntn@gmail.com>
Fri, 13 Aug 2010 20:25:53 +0000 (22:25 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 13 Aug 2010 20:25:53 +0000 (22:25 +0200)
commit1f6d5d5e608f65e86953bd0698a7af985de45b94
treea82ab1555f8b1fdbb2024547eae65fddb3441441
parent6e04cb95750423d62110e01c5efc56cf0e127293
parent043b5eb32eb58a85444caa6abada1b9fa811100e
Merge branch 'master' into terencehill/newpanelhud-dom_points
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/common/constants.qh
qcsrc/server/cl_client.qc