]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Fri, 17 Mar 2017 20:15:24 +0000 (23:15 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 17 Mar 2017 20:15:24 +0000 (23:15 +0300)
commitb3e0e567fa428d7016db433260753e02e182aaf1
treec52660650ba89d617041af01a3662edcb5a38ca1
parent86a0a0a448aa7a7a835fa0bd686963b0ec9c6f16
parentd90297fe2e485703b2d5ed64540727fd52ea1b4e
Merge branch 'master' into Lyberta/master
bal-wep-overkill.cfg
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/common/stats.qh
qcsrc/server/client.qc
qcsrc/server/mutators/events.qh