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: 677328b a34c7d6)

author	Lyberta <lyberta@lyberta.net>
	Wed, 22 Aug 2018 10:32:08 +0000 (13:32 +0300)
committer	Lyberta <lyberta@lyberta.net>
	Wed, 22 Aug 2018 10:32:08 +0000 (13:32 +0300)

		1	2
xonotic-server.cfg	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge