[tuhopuu-devel] State of the merge
cwant at ualberta.ca
Sun May 29 21:50:23 CEST 2005
The merge was as smooth as butter, with a
* buttons_object.c: particle UI conflicts -- went with bf since
that is where the work is being done these days. I did this
rather blindly, so it should be checked by somebody in the know.
* editfont.c: some conflicts here: mikasaari, please check that
your work is intact, or that the stuff that is presently in
this file does what you want it to.
* header_view3d.c: transform menu ... went with tuhopuu version.
Buttons for shrink/fatten, etc ... went with tuhopuu version.
* interface_draw.c: ui_draw_text_icon() had a conflict, went
with tuhopuu version (i.e., version with support for 'disabled'
stuff in the menu).
More information about the tuhopuu-devel