]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into bones_was_here/q3compat
authorbones_was_here <bones_was_here@xa.org.au>
Sat, 26 Sep 2020 10:39:08 +0000 (20:39 +1000)
committerbones_was_here <bones_was_here@xa.org.au>
Sat, 26 Sep 2020 10:39:08 +0000 (20:39 +1000)
commitb508390bc38d446e441ec990a1d34851251bd2cb
tree3ef9735486959e5f92bfae573abf2a7d7e19d0fc
parent3325ec95db59dd5283264ee9baefe124cbea4658
parentaafb3956d4321d56a6c34ccb1796b8bf6fa89458
Merge branch 'master' into bones_was_here/q3compat
qcsrc/common/physics/player.qc
qcsrc/server/client.qc
qcsrc/server/compat/quake.qc
qcsrc/server/compat/quake3.qc
qcsrc/server/main.qc
qcsrc/server/race.qc
qcsrc/server/weapons/spawning.qc
qcsrc/server/world.qc