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

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

author	Martin Taibr <taibr.martin@gmail.com>
	Mon, 26 Feb 2018 12:15:02 +0000 (13:15 +0100)
committer	Martin Taibr <taibr.martin@gmail.com>
	Mon, 26 Feb 2018 12:15:02 +0000 (13:15 +0100)

		1	2
README.md	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge