]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/server/command/getreplies.qc
Merge branch 'master' into terencehill/ft_autorevive_progress
authorterencehill <piuntn@gmail.com>
Sun, 17 Feb 2019 18:22:22 +0000 (19:22 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 17 Feb 2019 18:22:22 +0000 (19:22 +0100)
commit1236b060b5cde5ec310492417f2f4a03c367a423
tree5b5b01e0a032f237e0520f701d2afb4504ff0a4a
parent22a952ce0284640d15f5bb1135f750c3a141f6a4
parent797bf448a96c0c13d783c7c919bb2caf6fa16707
Merge branch 'master' into terencehill/ft_autorevive_progress

# Conflicts:
# qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc