Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Fri, 27 Apr 2018 09:21:48 +0000 (12:21 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 27 Apr 2018 09:21:48 +0000 (12:21 +0300)
commit821767330613f134fe04791532f44e63741ee6c6
treec96467ea3fb83c7833fa32645acb80323bbe1003
parent5aedfa18d17168daaf01162c2c4c6798be6d59d5
parent8c1b0e27f131c21a6004c2e43749a4b7ef317eb4
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
xonotic-server.cfg