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: 5388b5c 62eb96f)

author	Juhu <5894800-Juhu_@users.noreply.gitlab.com>
	Fri, 7 Aug 2020 15:48:41 +0000 (17:48 +0200)
committer	Juhu <5894800-Juhu_@users.noreply.gitlab.com>
	Fri, 7 Aug 2020 15:48:41 +0000 (17:48 +0200)
commit	6ae488fa94396ad9ffa0dc3dbfbedb54c8b7983a
tree	e5fe3a27b9aa9c030405e8bb6b656218d52d9149	tree \| snapshot
parent	5388b5cae878b6d8712983677ba5d3353e565b88	commit \| diff
parent	62eb96f01acb32957dd89a4a20dd2b648b819361	commit \| diff

Merge branch 'master' into Juhu/strafehud

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