]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1c5a39 deb2ab5)
Merge branch 'Mario/movetype_push' into 'master'
authorMario <mario.mario@y7mail.com>
Sat, 11 Jul 2020 14:18:32 +0000 (14:18 +0000)
committerMario <mario.mario@y7mail.com>
Sat, 11 Jul 2020 14:18:32 +0000 (14:18 +0000)
Merge branch Mario/movetype_push (S merge request)

See merge request xonotic/xonotic-data.pk3dir!823

1  2 
qcsrc/server/g_world.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/g_world.qc
Simple merge