Merge remote branch 'origin/terencehill/physics_panel_updates'
authorSamual <samual@xonotic.org>
Sun, 26 Feb 2012 01:14:16 +0000 (20:14 -0500)
committerSamual <samual@xonotic.org>
Sun, 26 Feb 2012 01:14:16 +0000 (20:14 -0500)
1  2 
_hud_descriptions.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

Simple merge
diff --cc hud_luminos.cfg
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc hud_nexuiz.cfg
Simple merge
Simple merge
Simple merge
Simple merge