[tuhopuu-devel] State of the merge

Matt Ebb matt at mke3.net
Tue Aug 9 06:52:17 CEST 2005


I'll give it a go soon. Thanks!

Matt


On 09/08/2005, at 11:54 AM, Chris Want wrote:

>
> Howdy,
>
> The merge went mostly ok, except for the usual problems
> with buttons code. Rather than trying to fix this stuff
> myself (and in the process damage the work of others)
> I've attached the files with conflicts that need
> resolving to this mail. Perhaps somebody who knows how
> to fix these can take a look, fix the conflicts, then
> commit the files?
>
> Regards,
> Chris
>
>
>
> <buttons_editing.c.gz>
> <buttons_object.c.gz>
> <buttons_scene.c.gz>
> <buttons_script.c.gz>
> <buttons_shading.c.gz>
> _______________________________________________
> tuhopuu-devel mailing list
> tuhopuu-devel at projects.blender.org
> http://projects.blender.org/mailman/listinfo/tuhopuu-devel
>



More information about the tuhopuu-devel mailing list