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