]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitff2e9a518b256c1cbaad9bc3eb7450f85ca8b80e
tree7b3bc38443190fe740457cc6418c19b256f36d9c
parent55ce8404e4f80a4b05089d33c36792199330629d
parent700e216d21c55f70a992e2b2a62fd5b0c75b6911
Merge branch 'master' into bones_was_here/q3compat
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