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)
commit4afba1cb5f5e1526d4f8c26dae616b6bc32e9461
tree7779edcf3e97720304c430a47ff2cbf2ee6f8efb
parent48f85772a504c472a24ca03aa67a6c3649c87cc1
parentbf9e79eb1f1af523678927f9e221b6e9cf20bf9f
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons

# Conflicts:
# .gitlab-ci.yml
bal-wep-xonotic.cfg
qcsrc/server/client.qc
xonotic-client.cfg
xonotic-server.cfg