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)
commit16e64ff58cf65d7b3e0815aadb530580a6aa251b
treec509803587a2e11ae8d158220145360b9dbc7184
parent81469f567c50ff04952a15fc020ef1d9d1d1c6a1
parent0aa7cb88f50114ef8b87f7b7e2efc07641ee050f
Merge branch 'master' into martin-t/effects
_hud_common.cfg
xonotic-client.cfg