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

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

author	Martin Taibr <taibr.martin@gmail.com>
	Sat, 10 Feb 2018 15:26:43 +0000 (16:26 +0100)
committer	Martin Taibr <taibr.martin@gmail.com>
	Sat, 10 Feb 2018 15:26:43 +0000 (16:26 +0100)
commit	19ad7dc5d62acfd72f90f9bafafa07e8f6efccb7
tree	6423f7c35065da9fdbea0726e043f08bf0a5ff2b	tree \| snapshot
parent	84f0ef2e09d581da11433fa029cc9b44f4b58092	commit \| diff
parent	45881fb1af30037591879eb93c5eea370255921c	commit \| diff

Merge branch 'master' into martin-t/okc3