[tuhopuu-devel] State of the merge

[Chris Want]

Here's some damage:

Timeline stuff: caused some conflicts, went with bf as often as
possible since that will be the future implementation.

blenderbuttons, BIF_resources.h: Ton updated the buttons in bf-blender
but I kept our buttons. Some of the icons may be wrong due to a
conflict in the enum in BIF_resources.h ... please keep your
eyes peeled for this (antihc3, this might have screwed up your
syntax buttons, for example).

buttons_editing.c: oh god, the horror... things getting smushed
together all over the place. The area for mesh tools like weight
groups should be checked.

buttons_object.c: conflicts in softbody stuff.

header_view3d.c: some conflicts related to proportional editing
buttons... there is a new G.scene->proportional thing that is
used now, so went with bf version.

Chris