]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into bones_was_here/q3compat
authorbones_was_here <bones_was_here@yahoo.com.au>
Mon, 20 Jul 2020 08:38:21 +0000 (18:38 +1000)
committerbones_was_here <bones_was_here@yahoo.com.au>
Mon, 20 Jul 2020 08:38:21 +0000 (18:38 +1000)
1  2 
qcsrc/common/mapobjects/trigger/jumppads.qc
qcsrc/common/physics/player.qc
qcsrc/common/weapons/weapon/shotgun.qc
qcsrc/common/weapons/weapon/shotgun.qh
qcsrc/server/client.qc
qcsrc/server/compat/quake3.qc
qcsrc/server/g_world.qc

Simple merge
Simple merge
Simple merge
Simple merge