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: 83093a5 bebef6b)

author	Lyberta <lyberta@lyberta.net>
	Sat, 17 Feb 2018 06:42:51 +0000 (09:42 +0300)
committer	Lyberta <lyberta@lyberta.net>
	Sat, 17 Feb 2018 06:42:51 +0000 (09:42 +0300)

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

Simple merge