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: c64e14c 9c89697)

author	Nikolay S <nick@teichisma.info>
	Sat, 7 Sep 2024 18:19:46 +0000 (20:19 +0200)
committer	Nikolay S <nick@teichisma.info>
	Sat, 7 Sep 2024 18:19:46 +0000 (20:19 +0200)
commit	61ad6f10fea217c910183ad740d1b5b52548c020
tree	9b4ba70d4f43af8995fd763dd865b7e23bbc7fa0	tree \| snapshot
parent	c64e14cb383c648360ce924790274a56631398bb	commit \| diff
parent	9c896977304e311bf2cdcb4c43dd5d6e1d264c06	commit \| diff

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

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/server/command/sv_cmd.qc	diff1 \|	diff2 \|	blob \| history
xonotic-server.cfg	diff1 \|	diff2 \|	blob \| history