]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Sat, 17 Feb 2018 05:43:10 +0000 (08:43 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 17 Feb 2018 05:43:10 +0000 (08:43 +0300)
commit83093a5626b3ec25a2dc4f87b24eda2a95a8335f
tree554b7ef7dfc3110baffa6df4adbb4e7ecaa43dea
parent91b221d451505a78397f800912c11c1f09d8c25d
parent9e8ea75b9aacffc5cfa18c8852c4dd9ffdbd3192
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/mutators/mutator/overkill/hmg.qc
qcsrc/common/mutators/mutator/overkill/okmachinegun.qc
qcsrc/common/mutators/mutator/overkill/oknex.qc
qcsrc/common/mutators/mutator/overkill/okshotgun.qc
qcsrc/common/mutators/mutator/overkill/rpc.qc
qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/common/wepent.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh