git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit

]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit

author	FruitieX <rasse@rasse-lappy.localdomain>
	Fri, 30 Jul 2010 12:58:45 +0000 (15:58 +0300)
committer	FruitieX <rasse@rasse-lappy.localdomain>
	Fri, 30 Jul 2010 12:58:45 +0000 (15:58 +0300)
commit	86b528612263e11b9b8c6fbf929b95cfcb972f42
tree	2ff942e4abde6132520790750bc2287b23fe440e	tree \| snapshot
parent	234777bc1e630f412e1b98ddf5b5e653c1c29eca	commit \| diff
parent	2b17138ef0518d31bbf0ec0d21ec6916f8041544	commit \| diff

Merge branch 'fruitiex/jumppadmodel1' into fruitiex/epsilon

Conflicts:
scripts/exx.shader
scripts/trak5x.shader