]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/gamemodes/gamemode/keepaway/sv_keepaway.qc
Merge branch 'master' into terencehill/scoreboard_item_stats
authorterencehill <piuntn@gmail.com>
Mon, 2 Nov 2020 09:49:30 +0000 (10:49 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 2 Nov 2020 09:49:30 +0000 (10:49 +0100)
commit5d43c54fb54232bcfd81f24876d2f1a82308c909
tree188388bcfeb1b3889d4efad81708a35100e7e1ae
parentb4a05edcafda171b224c9a809373f16ea1917290
parentc6a2f2ceed6a453934294f9dd44d4d8459e7a507
Merge branch 'master' into terencehill/scoreboard_item_stats
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/client/hud/panel/scoreboard.qh
qcsrc/client/mutators/events.qh