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

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

projects / xonotic / xonotic-data.pk3dir.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 69aca94 318a0d9)

author	Nikolay S <nick@teichisma.info>
	Wed, 27 Nov 2024 18:26:02 +0000 (19:26 +0100)
committer	Nikolay S <nick@teichisma.info>
	Wed, 27 Nov 2024 18:26:02 +0000 (19:26 +0100)
commit	22dd0713bfd06478c6091b34c47bd05e679810e1
tree	75205c36b25162f57ee0f23256381133bc84ebef	tree \| snapshot
parent	69aca94932b9fe0067695b4501096d60a900cc3e	commit \| diff
parent	318a0d92bd879bc3f540d5d444339cab959c4cf4	commit \| diff

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

14 files changed:

_hud_common.cfg	diff1 \|	diff2 \|	blob \| history
bal-wep-mario.cfg	diff1 \|	diff2 \|	blob \| history
bal-wep-nexuiz25.cfg	diff1 \|	diff2 \|	blob \| history
bal-wep-samual.cfg	diff1 \|	diff2 \|	blob \| history
bal-wep-xdf.cfg	diff1 \|	diff2 \|	blob \| history
bal-wep-xonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/_mod.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/_mod.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/stats.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/_mod.inc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/_mod.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/race.qc	diff1 \|	diff2 \|	blob \| history