comparison assets/Models/texture/halo.blend1 @ 274:dbecd276b51a

merged dylan's changes
author Robert McIntyre <rlm@mit.edu>
date Wed, 15 Feb 2012 06:58:26 -0700
parents f3e33fd5f97d
children
comparison
equal deleted inserted replaced
273:c39b8b29a79e 274:dbecd276b51a