[tuhopuu-devel] State of the Merge

Matt Ebb matt at mke3.net
Tue Jan 18 04:20:49 CET 2005


On 16 Jan 2005, at 5:17 AM, Chris Want wrote:

> The merge went pretty smoothly, here are the only two rough
> spots:

> Matt please check source/blender/python/api2_2x/Blender.c.
> See below ... I went with second version for each conflict.

Checked up on this, and all seems to be well. Thanks!

Matt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 2355 bytes
Desc: not available
Url : http://projects.blender.org/pipermail/tuhopuu-devel/attachments/20050118/64fd6a5a/smime.bin


More information about the tuhopuu-devel mailing list