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

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

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

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c1e50f f038742)

author	Nick S <nick@teichisma.info>
	Mon, 31 Jan 2022 14:03:47 +0000 (16:03 +0200)
committer	Nick S <nick@teichisma.info>
	Mon, 31 Jan 2022 14:03:47 +0000 (16:03 +0200)

		1	2
qcsrc/common/scores.qh	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge