]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/physics_panel_updates
authorterencehill <piuntn@gmail.com>
Thu, 10 Nov 2011 00:57:15 +0000 (01:57 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 10 Nov 2011 00:57:15 +0000 (01:57 +0100)
commit4666d229e9b631885c542e1e9f04cf78ec8b38f2
tree4c615a3670fea874dbf38c05d7dfba68aff4fa5b
parentbe85be6dad6016ed7d50ae5b7f8e5e4057692e8b
parent87bcf91b0bb31ca5292d26e18026b628db6185fa
Merge branch 'master' into terencehill/physics_panel_updates

Conflicts:
defaultXonotic.cfg
qcsrc/client/autocvars.qh
_hud_descriptions.cfg
defaultXonotic.cfg
hud_luminos.cfg
hud_luminos_minimal.cfg
hud_luminos_minimal_xhair.cfg
hud_luminos_old.cfg
hud_nexuiz.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud_config.qc