]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into z411/bai-server
authorz411 <z411@omaera.org>
Fri, 23 Apr 2021 19:47:36 +0000 (15:47 -0400)
committerz411 <z411@omaera.org>
Fri, 23 Apr 2021 19:47:36 +0000 (15:47 -0400)
commit702897c90862a43239b417cca503bf2c6d5089a3
tree29b72198da522d64f7586e445f30e0e492c3438b
parent10dea0fc8899b909d4c812c05089735d854fa35d
parent8792a57f18c87e60538e83ffc52ef2cd973e36ab
Merge branch 'master' into z411/bai-server
gamemodes-server.cfg
notifications.cfg
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/client/main.qc
qcsrc/client/view.qc
qcsrc/common/mapinfo.qh
qcsrc/common/mutators/mutator/instagib/sv_instagib.qc
qcsrc/common/notifications/all.inc
qcsrc/common/notifications/all.qh
qcsrc/common/util.qc
qcsrc/server/damage.qc