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

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

projects / xonotic / xonotic.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6b0e57 9feb4a4)

author	Samual <samual@xonotic.org>
	Mon, 26 Dec 2011 03:21:20 +0000 (22:21 -0500)
committer	Samual <samual@xonotic.org>
	Mon, 26 Dec 2011 03:21:20 +0000 (22:21 -0500)

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

Simple merge