[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/source nan_definitions.mk tuhopuu3/source/blender/blenkernel/intern image.c ipo.c object.c tuhopuu3/source/blender/blenloader/intern readfile.c writefile.c tuhopuu3/source/blender/makesdna ...

Chris Want cwant at ualberta.ca
Mon Jul 11 05:45:47 CEST 2005


hos (Chris Want) 2005/07/11 05:45:47 CEST

  Modified files:
    tuhopuu3/doc         merge-howto-tuhopuu3.txt 
    tuhopuu3/source      nan_definitions.mk 
    tuhopuu3/source/blender/blenkernel/intern image.c ipo.c 
                                              object.c 
    tuhopuu3/source/blender/blenloader/intern readfile.c 
                                              writefile.c 
    tuhopuu3/source/blender/makesdna DNA_userdef_types.h 
    tuhopuu3/source/blender/render/intern/source pixelshading.c 
    tuhopuu3/source/blender/renderconverter/intern 
                                                   convertBlenderScene.c 
    tuhopuu3/source/blender/src buttons_shading.c drawmesh.c 
                                drawobject.c editaction.c 
                                editarmature.c editipo.c 
                                editmesh.c editmesh_tools.c 
                                editobject.c header_view3d.c 
                                headerbuttons.c interface_panel.c 
                                outliner.c space.c 
                                transform_conversions.c 
                                transform_generics.c view.c 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.27      +2 -2      tuhopuu3/doc/merge-howto-tuhopuu3.txt
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.26&r2=1.27&cvsroot=tuhopuu>
  1.8       +1 -1      tuhopuu3/source/nan_definitions.mk
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/nan_definitions.mk.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.4       +2 -1      tuhopuu3/source/blender/blenkernel/intern/image.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/image.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.8       +5 -2      tuhopuu3/source/blender/blenkernel/intern/ipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/ipo.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.13      +13 -7     tuhopuu3/source/blender/blenkernel/intern/object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/object.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.28      +6 -9      tuhopuu3/source/blender/blenloader/intern/readfile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/readfile.c.diff?r1=1.27&r2=1.28&cvsroot=tuhopuu>
  1.18      +4 -3      tuhopuu3/source/blender/blenloader/intern/writefile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/writefile.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.19      +5 -4      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.18&r2=1.19&cvsroot=tuhopuu>
  1.3       +2 -1      tuhopuu3/source/blender/render/intern/source/pixelshading.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/render/intern/source/pixelshading.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.18      +2 -1      tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/renderconverter/intern/convertBlenderScene.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.32      +17 -0     tuhopuu3/source/blender/src/buttons_shading.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_shading.c.diff?r1=1.31&r2=1.32&cvsroot=tuhopuu>
  1.3       +2 -2      tuhopuu3/source/blender/src/drawmesh.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawmesh.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.37      +1 -2      tuhopuu3/source/blender/src/drawobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.36&r2=1.37&cvsroot=tuhopuu>
  1.11      +25 -36    tuhopuu3/source/blender/src/editaction.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editaction.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.5       +20 -52    tuhopuu3/source/blender/src/editarmature.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editarmature.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.18      +29 -3     tuhopuu3/source/blender/src/editipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editipo.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
  1.6       +3 -3      tuhopuu3/source/blender/src/editmesh.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.11      +11 -10    tuhopuu3/source/blender/src/editmesh_tools.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_tools.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.42      +34 -5     tuhopuu3/source/blender/src/editobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.41&r2=1.42&cvsroot=tuhopuu>
  1.31      +1 -1      tuhopuu3/source/blender/src/header_view3d.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_view3d.c.diff?r1=1.30&r2=1.31&cvsroot=tuhopuu>
  1.20      +2 -2      tuhopuu3/source/blender/src/headerbuttons.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/headerbuttons.c.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
  1.6       +9 -2      tuhopuu3/source/blender/src/interface_panel.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface_panel.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.12      +45 -42    tuhopuu3/source/blender/src/outliner.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/outliner.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.60      +91 -67    tuhopuu3/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.59&r2=1.60&cvsroot=tuhopuu>
  1.14      +9 -6      tuhopuu3/source/blender/src/transform_conversions.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_conversions.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.25      +1 -0      tuhopuu3/source/blender/src/transform_generics.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
  1.11      +45 -2     tuhopuu3/source/blender/src/view.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/view.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>



More information about the tuhopuu-cvs mailing list