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: d282af0 49260b6)

author	Mario <mario@smbclan.net>
	Tue, 14 Jun 2016 13:37:15 +0000 (23:37 +1000)
committer	Mario <mario@smbclan.net>
	Tue, 14 Jun 2016 13:37:15 +0000 (23:37 +1000)

		1	2
bal-wep-nexuiz25.cfg	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge