Skip to content
  • Mario's avatar
    Merge branch 'master' into Mario/buff_updates · 0e11fe37
    Mario authored
    # Conflicts:
    #	_hud_descriptions.cfg
    #	hud_luma.cfg
    #	hud_luminos.cfg
    #	hud_luminos_minimal.cfg
    #	hud_luminos_minimal_xhair.cfg
    #	hud_luminos_old.cfg
    #	hud_nexuiz.cfg
    #	qcsrc/client/hud.qc
    #	qcsrc/client/hud.qh
    0e11fe37