Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Wed, 29 Mar 2017 05:47:37 +0000 (08:47 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 29 Mar 2017 05:47:37 +0000 (08:47 +0300)
1  2 
defaultXonotic.cfg
qcsrc/server/client.qc

Simple merge
Simple merge