Merge branch 'master' into martin-t/effects
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 20 Oct 2018 14:29:33 +0000 (16:29 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 20 Oct 2018 14:29:33 +0000 (16:29 +0200)
1  2 
_hud_common.cfg
xonotic-client.cfg

diff --cc _hud_common.cfg
Simple merge
Simple merge