• terencehill's avatar
    Merge branch 'master' into terencehill/itemstime · 3a4877cd
    terencehill 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.qh
    	qcsrc/common/stats.qh
    3a4877cd
defaultXonotic.cfg 81.9 KB