]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/ft_autorevive_progress
authorMario <mario.mario@y7mail.com>
Fri, 6 Nov 2020 15:00:06 +0000 (01:00 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 6 Nov 2020 15:00:06 +0000 (01:00 +1000)
commitf64d037f9d2f38d874422e04d6147c1876a1c829
treeb16572bb0bc33ec7ab04706bbf25b921d1d8f760
parenta0fd208362840417b2e12a61a002983cbd2aea07
parentc57efea24625aae14145ef68e2b42faacfd275e8
Merge branch 'master' into terencehill/ft_autorevive_progress
qcsrc/client/view.qc
qcsrc/server/damage.qc
qcsrc/server/player.qc