git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

Merge remote-tracking branch 'origin/master' into morosophos/server-current4

_hud_common.cfg	diff1 \|	diff2 \|	blob \| history
bal-wep-mario.cfg	diff1 \|	diff2 \|	blob \| history
bal-wep-xonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mapobjects/trigger/jumppads.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/scores.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/stats.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/crylink.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/damage.qc	diff1 \|	diff2 \|	blob \| history
xonotic-server.cfg	diff1 \|	diff2 \|	blob \| history