Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Fri, 28 Apr 2017 18:47:00 +0000 (21:47 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 28 Apr 2017 18:47:00 +0000 (21:47 +0300)
commit0d3433983a92ad80893fd18781e01a99857e94c1
treeefd6e89bddb0e79e94db4ee73bc8738f313320c9
parentb899cfaab2db2509d752455cc6e099c6c9c3884b
parent45e13bf47c14855400cbaa613e087c260dc49343
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
defaultXonotic.cfg
qcsrc/client/view.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh