[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/source/blender/include blendef.h tuhopuu3/source/blender/makesdna DNA_material_types.h DNA_userdef_types.h tuhopuu3/source/blender/python BPY_menus.c tuhopuu3/source/blender/render/intern/source rendercore.c tuhopuu3/source/blender/src ...

[Chris Want]

hos (Chris Want) 2005/01/25 18:24:59 CET

  Modified files:
    tuhopuu3/doc         merge-howto-tuhopuu3.txt 
    tuhopuu3/source/blender/include blendef.h 
    tuhopuu3/source/blender/makesdna DNA_material_types.h 
                                     DNA_userdef_types.h 
    tuhopuu3/source/blender/python BPY_menus.c 
    tuhopuu3/source/blender/render/intern/source rendercore.c 
    tuhopuu3/source/blender/src buttons_editing.c 
                                buttons_shading.c header_image.c 
                                headerbuttons.c interface.c 
                                interface_draw.c previewrender.c 
                                space.c toolbox.c usiblender.c 
  
  Log:
  Post merge conflict resolution.
  
  Revision  Changes    Path
  1.2       +6 -3      tuhopuu3/doc/merge-howto-tuhopuu3.txt
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.1&r2=1.2&cvsroot=tuhopuu>
  1.4       +2 -1      tuhopuu3/source/blender/include/blendef.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/blendef.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.4       +2 -1      tuhopuu3/source/blender/makesdna/DNA_material_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_material_types.h.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.5       +2 -1      tuhopuu3/source/blender/makesdna/DNA_userdef_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_userdef_types.h.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.3       +2 -6      tuhopuu3/source/blender/python/BPY_menus.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/python/BPY_menus.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.5       +35 -19    tuhopuu3/source/blender/render/intern/source/rendercore.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/render/intern/source/rendercore.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.6       +7 -2      tuhopuu3/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.5       +4 -1      tuhopuu3/source/blender/src/buttons_shading.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_shading.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.9       +1 -7      tuhopuu3/source/blender/src/header_image.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_image.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.4       +13 -1     tuhopuu3/source/blender/src/headerbuttons.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/headerbuttons.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.9       +3 -2      tuhopuu3/source/blender/src/interface.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.7       +4 -1      tuhopuu3/source/blender/src/interface_draw.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface_draw.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.4       +32 -19    tuhopuu3/source/blender/src/previewrender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/previewrender.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.22      +4 -6      tuhopuu3/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.21&r2=1.22&cvsroot=tuhopuu>
  1.6       +5 -4      tuhopuu3/source/blender/src/toolbox.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toolbox.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.5       +4 -6      tuhopuu3/source/blender/src/usiblender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/usiblender.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>