]> 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: 7915493 3f51fd2)
Merge branch 'terencehill/fps_display_fix' into 'master'
authorMario <mario.mario@y7mail.com>
Mon, 5 Oct 2020 09:52:46 +0000 (09:52 +0000)
committerMario <mario.mario@y7mail.com>
Mon, 5 Oct 2020 09:52:46 +0000 (09:52 +0000)
fps display fix

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

1  2 
qcsrc/client/hud/panel/engineinfo.qc patch | diff1 | diff2 | blob | history
qcsrc/client/view.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/hud/panel/engineinfo.qc
Simple merge
diff --cc qcsrc/client/view.qc
Simple merge