git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff

]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff

projects / xonotic / xonotic.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4331b69 7f20967)

author	Mario <mario@smbclan.net>
	Fri, 19 Oct 2018 21:10:58 +0000 (07:10 +1000)
committer	Mario <mario@smbclan.net>
	Fri, 19 Oct 2018 21:10:58 +0000 (07:10 +1000)

		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge