[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/source/blender/blenkernel/intern object.c tuhopuu3/source/blender/python/api2_2x Blender.c tuhopuu3/source/blender/src buttons_editing.c drawview.c header_view3d.c headerbuttons.c previewrender.c space.c

[Chris Want]

hos (Chris Want) 2005/02/13 21:26:17 CET

  Modified files:
    tuhopuu3/doc         merge-howto-tuhopuu3.txt 
    tuhopuu3/source/blender/blenkernel/intern object.c 
    tuhopuu3/source/blender/python/api2_2x Blender.c 
    tuhopuu3/source/blender/src buttons_editing.c drawview.c 
                                header_view3d.c headerbuttons.c 
                                previewrender.c space.c 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.5       +4 -12     tuhopuu3/doc/merge-howto-tuhopuu3.txt
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.3       +18 -3     tuhopuu3/source/blender/blenkernel/intern/object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/object.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.5       +5 -7      tuhopuu3/source/blender/python/api2_2x/Blender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/python/api2_2x/Blender.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.12      +6 -3      tuhopuu3/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.9       +4 -3      tuhopuu3/source/blender/src/drawview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.9       +2 -2      tuhopuu3/source/blender/src/header_view3d.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_view3d.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.5       +1 -1      tuhopuu3/source/blender/src/headerbuttons.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/headerbuttons.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.8       +13 -7     tuhopuu3/source/blender/src/previewrender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/previewrender.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.28      +4 -0      tuhopuu3/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.27&r2=1.28&cvsroot=tuhopuu>