[tuhopuu-cvs] CVS commit: tuhopuu3/source/blender/python/api2_2x Blender.c tuhopuu3/source/blender/src buttons_scene.c buttons_shading.c drawipo.c editfont.c editipo.c editobject.c header_view3d.c space.c transform.c transform.h transform_constraints.c transform_constraints.h transform_generics.c ...

[Chris Want]

hos (Chris Want) 2005/03/07 03:32:19 CET

  Modified files:
    tuhopuu3/source/blender/python/api2_2x Blender.c 
    tuhopuu3/source/blender/src buttons_scene.c buttons_shading.c 
                                drawipo.c editfont.c editipo.c 
                                editobject.c header_view3d.c 
                                space.c transform.c transform.h 
                                transform_constraints.c 
                                transform_constraints.h 
                                transform_generics.c 
                                transform_generics.h 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.6       +1 -0      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.5&r2=1.6&cvsroot=tuhopuu>
  1.9       +131 -0    tuhopuu3/source/blender/src/buttons_scene.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_scene.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.14      +27 -60    tuhopuu3/source/blender/src/buttons_shading.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_shading.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
  1.3       +4 -3      tuhopuu3/source/blender/src/drawipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawipo.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.3       +2 -2      tuhopuu3/source/blender/src/editfont.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editfont.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.5       +10 -15    tuhopuu3/source/blender/src/editipo.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editipo.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.13      +12 -5     tuhopuu3/source/blender/src/editobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.12      +3 -1      tuhopuu3/source/blender/src/header_view3d.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_view3d.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
  1.33      +12 -9     tuhopuu3/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.32&r2=1.33&cvsroot=tuhopuu>
  1.16      +220 -168  tuhopuu3/source/blender/src/transform.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.c.diff?r1=1.15&r2=1.16&cvsroot=tuhopuu>
  1.11      +10 -4     tuhopuu3/source/blender/src/transform.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.h.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.13      +171 -95   tuhopuu3/source/blender/src/transform_constraints.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_constraints.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.7       +4 -4      tuhopuu3/source/blender/src/transform_constraints.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_constraints.h.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.10      +4 -0      tuhopuu3/source/blender/src/transform_generics.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
  1.6       +3 -1      tuhopuu3/source/blender/src/transform_generics.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.h.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>