[tuhopuu-devel] State of the merge

[Martin Poirier]

--- Chris Want <cwant at ualberta.ca> wrote:

> Basically, the transform stuff caused most of the
> conflicts. I am operating on the assumption that
> work on this will continue only in bf-blender, and
> so whenever there was some ambiguity about what
> code to choose, I chose the version from bf.

That assumption is correct.

Martin

__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com