]> 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: 1c2b524 f68a8db)
Merge branch 'terencehill/ft_bugfix' into 'master'
authorMario <zacjardine@y7mail.com>
Thu, 27 Sep 2018 01:26:44 +0000 (01:26 +0000)
committerMario <zacjardine@y7mail.com>
Thu, 27 Sep 2018 01:26:44 +0000 (01:26 +0000)
FT bugfixes

Closes #2098 and #2079

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

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

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