]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
authorNick S <nick@teichisma.info>
Thu, 22 Jun 2023 19:07:14 +0000 (22:07 +0300)
committerNick S <nick@teichisma.info>
Thu, 22 Jun 2023 19:07:14 +0000 (22:07 +0300)
commitb5c7534a21eb96c253752ddd8d4e959919f64dc7
treec032ba17bc97d44145de356afaf50d2e70515579
parent23b87a97ebc973b9a8acfd0d77a29e2b60872395
parent4a7bd436b75bc975c98e7b5de69aca8074f450b6
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
qcsrc/common/mapobjects/trigger/jumppads.qc