]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - hud_luminos_minimal_xhair.cfg
Merge branch 'master' into terencehill/ft_autorevive_progress
authorterencehill <piuntn@gmail.com>
Mon, 30 Sep 2019 18:07:27 +0000 (20:07 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 30 Sep 2019 18:07:27 +0000 (20:07 +0200)
commit565754a35f9e84a3b8e6eac08635ec27145b369a
tree34ef89788fbbf9da6006ac7bd705b3809ff6e04e
parent7513df962b61185b93a49e39b6bb054e20781a4b
parent55f166a94432b80e71f6f76702a1b15fde60c474
Merge branch 'master' into terencehill/ft_autorevive_progress

# Conflicts:
# gamemodes-server.cfg
gamemodes-server.cfg
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qh
qcsrc/server/g_damage.qc
qcsrc/server/player.qc