]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/Juhu/velocity_pads' into morosophos/server-current4
authorNick S <nick@teichisma.info>
Wed, 15 Feb 2023 18:33:51 +0000 (20:33 +0200)
committerNick S <nick@teichisma.info>
Wed, 15 Feb 2023 18:33:51 +0000 (20:33 +0200)
commit8aa2ca8d8a3aee2a02f2876e0dddc8c9826212f2
tree19191f0cbf3da6c7e462590e74400fe1e5ef4ccd
parent23099ad24d430e2920de607a5359fba6e4926035
parentf0110262ff25a8b728ef242e22ccea407ec83b50
Merge remote-tracking branch 'origin/Juhu/velocity_pads' into morosophos/server-current4
qcsrc/common/mapobjects/trigger/jumppads.qc
qcsrc/common/mapobjects/trigger/jumppads.qh