de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit - textures/effects_jumppad/jumppadfx1

]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit - textures/effects_jumppad/jumppadfx1_b.tga

author	Maik Merten <maikmerten@googlemail>
	Sat, 9 Oct 2010 18:01:22 +0000 (20:01 +0200)
committer	Maik Merten <maikmerten@googlemail>
	Sat, 9 Oct 2010 18:01:22 +0000 (20:01 +0200)
commit	379abcae267f84b644177ff1b801aa9ea7d344ec
tree	39e66f06dce6486371827e32191459cb01a14290	tree \| snapshot
parent	1a04e1dc16a20dec46d3b231148ad1bffc13a27e	commit \| diff
parent	517428d8f83a13dd96f059f66075c8d2e84e7cb6	commit \| diff

Merge branch 'morphed/ionpump' of ssh://git.xonotic.org/xonotic-maps.pk3dir into divVerent/courtfun2