[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/source/blender/blenkernel/intern mball.c tuhopuu3/source/blender/src buttons_editing.c editmball.c header_view3d.c

[Chris Want]

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

  Modified files:
    tuhopuu3/doc         merge-howto-tuhopuu3.txt 
    tuhopuu3/source/blender/blenkernel/intern mball.c 
    tuhopuu3/source/blender/src buttons_editing.c editmball.c 
                                header_view3d.c 
  
  Log:
  Post-merge comflict resolution.
  
  I decided to do another quick merge, or else I think any modification
  of the transform stuff would cause a conflict next time around.
  
  Revision  Changes    Path
  1.7       +4 -4      tuhopuu3/doc/merge-howto-tuhopuu3.txt
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.3       +13 -11    tuhopuu3/source/blender/blenkernel/intern/mball.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/mball.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.14      +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.13&r2=1.14&cvsroot=tuhopuu>
  1.3       +3 -2      tuhopuu3/source/blender/src/editmball.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmball.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.11      +34 -0     tuhopuu3/source/blender/src/header_view3d.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_view3d.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>