Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Thu, 1 Jun 2017 13:09:53 +0000 (16:09 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 1 Jun 2017 13:09:53 +0000 (16:09 +0300)
1  2 
defaultXonotic.cfg
qcsrc/server/client.qc
qcsrc/server/defs.qh

Simple merge
Simple merge
Simple merge