[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/source nan_compile.mk tuhopuu3/source/blender/include BIF_editmesh.h tuhopuu3/source/blender/src SConscript buttons_editing.c drawobject.c drawview.c editmesh_mods.c editobject.c editview.c ...

[Chris Want]

hos (Chris Want) 2005/02/21 03:44:59 CET

  Modified files:
    tuhopuu3/doc         merge-howto-tuhopuu3.txt 
    tuhopuu3/source      nan_compile.mk 
    tuhopuu3/source/blender/include BIF_editmesh.h 
    tuhopuu3/source/blender/src SConscript buttons_editing.c 
                                drawobject.c drawview.c 
                                editmesh_mods.c editobject.c 
                                editview.c header_view3d.c space.c 
  
  Log:
  Post merge conflict resolution
  
  Revision  Changes    Path
  1.6       +4 -4      tuhopuu3/doc/merge-howto-tuhopuu3.txt
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.3       +11 -8     tuhopuu3/source/nan_compile.mk
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/nan_compile.mk.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.3       +2 -2      tuhopuu3/source/blender/include/BIF_editmesh.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_editmesh.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.4       +2 -2      tuhopuu3/source/blender/src/SConscript
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/SConscript.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.13      +1 -1      tuhopuu3/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.13      +1 -13     tuhopuu3/source/blender/src/drawobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.10      +3 -3      tuhopuu3/source/blender/src/drawview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.3       +5 -2      tuhopuu3/source/blender/src/editmesh_mods.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_mods.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.9       +10 -7     tuhopuu3/source/blender/src/editobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.3       +7 -11     tuhopuu3/source/blender/src/editview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editview.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.10      +6 -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.9&r2=1.10&cvsroot=tuhopuu>
  1.29      +11 -11    tuhopuu3/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.28&r2=1.29&cvsroot=tuhopuu>