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

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

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

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c2bee8d fd2140d)

author	Lyberta <lyberta@lyberta.net>
	Thu, 23 Mar 2017 04:22:56 +0000 (07:22 +0300)
committer	Lyberta <lyberta@lyberta.net>
	Thu, 23 Mar 2017 04:22:56 +0000 (07:22 +0300)

		1	2
defaultXonotic.cfg	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge