]> 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: 0b81c8d 93e98e9)
Merge branch 'master' into Mario/speed_var
authorMario <mario.mario@y7mail.com>
Fri, 17 Jul 2020 07:33:02 +0000 (17:33 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 17 Jul 2020 07:33:02 +0000 (17:33 +1000)
1  2 
qcsrc/common/stats.qh patch | diff1 | diff2 | blob | history
qcsrc/ecs/systems/cl_physics.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/stats.qh
Simple merge
diff --cc qcsrc/ecs/systems/cl_physics.qc
Simple merge