]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
authorNick S <nick@teichisma.info>
Thu, 29 Jun 2023 21:46:42 +0000 (00:46 +0300)
committerNick S <nick@teichisma.info>
Thu, 29 Jun 2023 21:46:42 +0000 (00:46 +0300)
commita657361d3a16752c8adef3e7aeaa438d44fccd8c
tree2e257772b50cc21fab5ae6f593421f7132461462
parentabdec439c92b8eec3c4a21b79e5f30b1cc30a867
parent37665075d091a82794104aebee63dd4f1d66208d
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
qcsrc/common/mapobjects/trigger/jumppads.qc
qcsrc/common/mapobjects/trigger/jumppads.qh