Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorMario <mario@smbclan.net>
Thu, 31 May 2018 05:34:01 +0000 (15:34 +1000)
committerMario <mario@smbclan.net>
Thu, 31 May 2018 05:34:01 +0000 (15:34 +1000)
# Conflicts:
# .gitlab-ci.yml

1  2 
bal-wep-xonotic.cfg
qcsrc/server/client.qc
xonotic-client.cfg
xonotic-server.cfg

Simple merge
Simple merge
Simple merge
Simple merge