[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/source/blender/blenkernel/intern font.c material.c tuhopuu3/source/blender/blenloader/intern readfile.c tuhopuu3/source/blender/include BDR_editobject.h BIF_editfont.h tuhopuu3/source/blender/makesdna DNA_space_types.h ...

[Chris Want]

hos (Chris Want) 2005/06/28 05:30:10 CEST

  Modified files:
    tuhopuu3/doc         merge-howto-tuhopuu3.txt 
    tuhopuu3/source/blender/blenkernel/intern font.c material.c 
    tuhopuu3/source/blender/blenloader/intern readfile.c 
    tuhopuu3/source/blender/include BDR_editobject.h 
                                    BIF_editfont.h 
    tuhopuu3/source/blender/makesdna DNA_space_types.h 
    tuhopuu3/source/blender/python/api2_2x Blender.c 
    tuhopuu3/source/blender/src SConscript buttons_editing.c 
                                drawimage.c editcurve.c editfont.c 
                                editmesh.c editobject.c editsima.c 
                                header_image.c usiblender.c 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.25      +2 -2      tuhopuu3/doc/merge-howto-tuhopuu3.txt
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
  1.13      +10 -3     tuhopuu3/source/blender/blenkernel/intern/font.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/font.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.4       +4 -1      tuhopuu3/source/blender/blenkernel/intern/material.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/material.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
  1.25      +2 -1      tuhopuu3/source/blender/blenloader/intern/readfile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/readfile.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
  1.3       +2 -2      tuhopuu3/source/blender/include/BDR_editobject.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BDR_editobject.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.5       +4 -1      tuhopuu3/source/blender/include/BIF_editfont.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/BIF_editfont.h.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.9       +3 -1      tuhopuu3/source/blender/makesdna/DNA_space_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_space_types.h.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.14      +4 -4      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.13&r2=1.14&cvsroot=tuhopuu>
  1.12      +1 -0      tuhopuu3/source/blender/src/SConscript
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/SConscript.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.39      +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.38&r2=1.39&cvsroot=tuhopuu>
  1.14      +30 -16    tuhopuu3/source/blender/src/drawimage.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawimage.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.3       +2 -5      tuhopuu3/source/blender/src/editcurve.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editcurve.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.12      +7 -11     tuhopuu3/source/blender/src/editfont.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editfont.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.3       +3 -9      tuhopuu3/source/blender/src/editmesh.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.39      +24 -3     tuhopuu3/source/blender/src/editobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.38&r2=1.39&cvsroot=tuhopuu>
  1.14      +16 -10    tuhopuu3/source/blender/src/editsima.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editsima.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.15      +10 -6     tuhopuu3/source/blender/src/header_image.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_image.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
  1.18      +4 -1      tuhopuu3/source/blender/src/usiblender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/usiblender.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>