[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/make/xc_blender/xc_blender.xcode project.pbxproj tuhopuu3/source/blender/blenkernel/intern blender.c mball.c tuhopuu3/source/blender/blenloader/intern readfile.c tuhopuu3/source/blender/include BIF_resources.h tuhopuu3/source/blender/renderconverter/intern ...

[Chris Want]

hos (Chris Want) 2005/06/05 02:35:44 CEST

  Modified files:
    tuhopuu3/doc         merge-howto-tuhopuu3.txt 
    tuhopuu3/make/xc_blender/xc_blender.xcode project.pbxproj 
    tuhopuu3/source/blender/blenkernel/intern blender.c mball.c 
    tuhopuu3/source/blender/blenloader/intern readfile.c 
    tuhopuu3/source/blender/include BIF_resources.h 
    tuhopuu3/source/blender/renderconverter/intern 
                                                   convertBlenderScene.c 
    tuhopuu3/source/blender/src buttons_editing.c buttons_object.c 
                                drawobject.c drawtext.c 
                                editmesh_tools.c editsima.c 
                                filesel.c outliner.c toolbox.c 
                                transform.c 
                                transform_conversions.c 
                                transform_generics.c 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.23      +4 -4      tuhopuu3/doc/merge-howto-tuhopuu3.txt
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.22&r2=1.23&cvsroot=tuhopuu>
  1.8       +2 -2      tuhopuu3/make/xc_blender/xc_blender.xcode/project.pbxproj
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/make/xc_blender/xc_blender.xcode/project.pbxproj.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.6       +4 -1      tuhopuu3/source/blender/blenkernel/intern/blender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/blender.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.7       +71 -24    tuhopuu3/source/blender/blenkernel/intern/mball.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/mball.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.21      +29 -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.20&r2=1.21&cvsroot=tuhopuu>
  1.20      +4 -4      tuhopuu3/source/blender/include/BIF_resources.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_resources.h.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
  1.13      +1 -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.12&r2=1.13&cvsroot=tuhopuu>
  1.33      +2 -0      tuhopuu3/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.32&r2=1.33&cvsroot=tuhopuu>
  1.31      +4 -4      tuhopuu3/source/blender/src/buttons_object.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_object.c.diff?r1=1.30&r2=1.31&cvsroot=tuhopuu>
  1.33      +1 -1      tuhopuu3/source/blender/src/drawobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.32&r2=1.33&cvsroot=tuhopuu>
  1.26      +1 -1      tuhopuu3/source/blender/src/drawtext.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawtext.c.diff?r1=1.25&r2=1.26&cvsroot=tuhopuu>
  1.8       +1 -1      tuhopuu3/source/blender/src/editmesh_tools.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_tools.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.13      +3 -3      tuhopuu3/source/blender/src/editsima.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editsima.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.7       +12 -4     tuhopuu3/source/blender/src/filesel.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/filesel.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.8       +2 -0      tuhopuu3/source/blender/src/outliner.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/outliner.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.20      +3 -3      tuhopuu3/source/blender/src/toolbox.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toolbox.c.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
  1.33      +18 -5     tuhopuu3/source/blender/src/transform.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.c.diff?r1=1.32&r2=1.33&cvsroot=tuhopuu>
  1.9       +10 -4     tuhopuu3/source/blender/src/transform_conversions.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_conversions.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.22      +2 -2      tuhopuu3/source/blender/src/transform_generics.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.c.diff?r1=1.21&r2=1.22&cvsroot=tuhopuu>