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)
commit725a0a04e9118c9ca833987803f8f80a08360aa0
tree71673e5d90fd32d4cdcd71e8bc2bb75fd214fc6b
parent5617387593ef7221da130467941929b578be8731
parentf15553e9346a2d78e10e9a759d9af1c9a93a44ca
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
defaultXonotic.cfg
qcsrc/server/client.qc