]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into z411
authorz411 <z411@omaera.org>
Mon, 24 Aug 2020 17:25:42 +0000 (13:25 -0400)
committerz411 <z411@omaera.org>
Mon, 24 Aug 2020 17:25:42 +0000 (13:25 -0400)
commit0af002b86e0266141c2830f30a41e7afbd69f70d
treedaa63194148dcead552d08f44f94a75e4dc7fc78
parent954071d7c9aa3146ce1ca5a8f8604eebffc0dfe5
parent1bedb9300b23b98c65d2c7babc3e4d013f7c2e17
Merge branch 'master' into z411
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/client/hud/panel/timer.qc
qcsrc/client/view.qc
qcsrc/common/notifications/all.inc
qcsrc/common/stats.qh
qcsrc/server/command/common.qc
qcsrc/server/damage.qc
qcsrc/server/scores.qc
qcsrc/server/world.qc
qcsrc/server/world.qh