de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit

]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit - sound/map_xoylent/object_exhaust.ogg

author	Rudolf Polzer <divverent@xonotic.org>
	Sat, 9 Jul 2011 14:15:03 +0000 (16:15 +0200)
committer	Rudolf Polzer <divverent@xonotic.org>
	Sat, 9 Jul 2011 14:15:03 +0000 (16:15 +0200)
commit	abaf76aed876b9317a05eba71c38255f8ea8921e
tree	88ba1e57b42c65bb72cdbaa6e418e24e55fd521e	tree \| snapshot
parent	d6acc63fbe0254244735a561a4ec93990b2e5718	commit \| diff
parent	877b8212505540880ce7204e1a369f35be028bab	commit \| diff

Merge remote-tracking branch 'origin/master' into divVerent/courtfun2

Conflicts:
scripts/shaderlist.txt