[tuhopuu-devel] State of the merge

[Chris Want]

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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: buttons_editing.c.gz
Type: application/gzip
Size: 34160 bytes
Desc: not available
Url : http://projects.blender.org/pipermail/tuhopuu-devel/attachments/20050808/f686f6fb/buttons_editing.c-0001.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: buttons_object.c.gz
Type: application/gzip
Size: 16768 bytes
Desc: not available
Url : http://projects.blender.org/pipermail/tuhopuu-devel/attachments/20050808/f686f6fb/buttons_object.c-0001.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: buttons_scene.c.gz
Type: application/gzip
Size: 15783 bytes
Desc: not available
Url : http://projects.blender.org/pipermail/tuhopuu-devel/attachments/20050808/f686f6fb/buttons_scene.c-0001.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: buttons_script.c.gz
Type: application/gzip
Size: 3753 bytes
Desc: not available
Url : http://projects.blender.org/pipermail/tuhopuu-devel/attachments/20050808/f686f6fb/buttons_script.c-0001.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: buttons_shading.c.gz
Type: application/gzip
Size: 39759 bytes
Desc: not available
Url : http://projects.blender.org/pipermail/tuhopuu-devel/attachments/20050808/f686f6fb/buttons_shading.c-0001.bin