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: f4366aa 359f6e1)

author	Nikolay S <nick@teichisma.info>
	Mon, 2 Sep 2024 17:29:23 +0000 (19:29 +0200)
committer	Nikolay S <nick@teichisma.info>
	Mon, 2 Sep 2024 17:29:23 +0000 (19:29 +0200)
commit	a3cae826d5671aa60722c6494c08adacb0c50c14
tree	0541d03041de77fca22ce51a8252beaa593485f0	tree \| snapshot
parent	f4366aa58e46ff4730500154d3ba24db2a0dbc21	commit \| diff
parent	359f6e1614d712861383e237eb5b8d4df324e635	commit \| diff

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

13 files changed:

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/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/gamemodes/gamemode/cts/sv_cts.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/crylink.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/sv_cmd.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/race.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/race.qh	diff1 \|	diff2 \|	blob \| history
xonotic-server.cfg	diff1 \|	diff2 \|	blob \| history