git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff

]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff

projects / xonotic / xonotic-maps.pk3dir.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12eb5da 686a21c)

author	Mirio <opivy@hotmail.de>
	Fri, 17 Jun 2022 08:48:31 +0000 (08:48 +0000)
committer	Mirio <opivy@hotmail.de>
	Fri, 17 Jun 2022 08:48:31 +0000 (08:48 +0000)

Mirio/opium

See merge request xonotic/xonotic-maps.pk3dir!135

		1	2
scripts/shaderlist.txt	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge