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

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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 5daa489 f40126e)

author	Juhu <5894800-Juhu_@users.noreply.gitlab.com>
	Sat, 20 Jun 2020 14:35:07 +0000 (16:35 +0200)
committer	Juhu <5894800-Juhu_@users.noreply.gitlab.com>
	Sat, 20 Jun 2020 14:35:07 +0000 (16:35 +0200)
commit	38f4a1731d66faca35562977b145f76e119f2887
tree	bf5baed36874eaeac10ef2f09dc680a51938a89e	tree \| snapshot
parent	5daa4890f366dc18818b50579ca3e35662a19646	commit \| diff
parent	f40126e8e3bbaf7fe10dc7644674406225df3766	commit \| diff

Merge remote-tracking branch 'origin/master' into Juhu/strafehud

_hud_common.cfg	diff1 \|	diff2 \|	blob \| history
_hud_descriptions.cfg	diff1 \|	diff2 \|	blob \| history
hud_luma.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_minimal.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_minimal_xhair.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_old.cfg	diff1 \|	diff2 \|	blob \| history
hud_nexuiz.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/hud.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/_mod.qh	diff1 \|	diff2 \|	blob \| history