]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/nexcompat_weaponswap Mario/nexcompat_weaponswap
authorMario <mario.mario@y7mail.com>
Wed, 3 Jun 2020 08:36:21 +0000 (18:36 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 3 Jun 2020 08:36:21 +0000 (18:36 +1000)
commitd2810235220d0f95a4e51b19cb08c6ff5aea2f3d
treea96b542e8525e8de547774444ac50a3e287ebaf5
parent355514f2ecd2a305b02c797084389e81d26c0e0a
parentcfc71e27c5a5d494d384e3f003da385c0999a432
Merge branch 'master' into Mario/nexcompat_weaponswap
qcsrc/common/t_items.qc
qcsrc/common/weapons/weapon/minelayer.qc
qcsrc/server/autocvars.qh
qcsrc/server/weapons/spawning.qc
xonotic-server.cfg