]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f48e53 f20db00)
Merge branch 'Mario/crouch' into 'master'
authorMario <zacjardine@y7mail.com>
Fri, 6 Apr 2018 17:43:10 +0000 (17:43 +0000)
committerMario <zacjardine@y7mail.com>
Fri, 6 Apr 2018 17:43:10 +0000 (17:43 +0000)
Merge branch Mario/crouch (XS merge request)

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

1  2 
qcsrc/common/physics/player.qh patch | diff1 | diff2 | blob | history
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/physics/player.qh
Simple merge
diff --cc qcsrc/server/client.qc
Simple merge