[Soc-2005-cvs] CVS commit: soc-blender/source/blender/blenkernel/intern modifier.c soc-blender/source/blender/python/api2_2x Mesh.c point.c sceneTimeLine.c soc-blender/source/blender/src fluidsim.c

[Jiri Hnidek]

jiri (Jiri Hnidek) 2005/12/19 15:05:46 CET

  Modified files:
    soc-blender/source/blender/blenkernel/intern modifier.c 
    soc-blender/source/blender/python/api2_2x Mesh.c point.c 
                                              sceneTimeLine.c 
    soc-blender/source/blender/src fluidsim.c 
  
  Log:
   - post-merge conflict resolution
  
  Revision  Changes    Path
  1.16      +1 -1      soc-blender/source/blender/blenkernel/intern/modifier.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/blenkernel/intern/modifier.c.diff?r1=1.15&r2=1.16&cvsroot=soc-2005>
  1.4       +38 -6     soc-blender/source/blender/python/api2_2x/Mesh.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/python/api2_2x/Mesh.c.diff?r1=1.3&r2=1.4&cvsroot=soc-2005>
  1.5       +10 -14    soc-blender/source/blender/python/api2_2x/point.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/python/api2_2x/point.c.diff?r1=1.4&r2=1.5&cvsroot=soc-2005>
  1.3       +56 -18    soc-blender/source/blender/python/api2_2x/sceneTimeLine.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/python/api2_2x/sceneTimeLine.c.diff?r1=1.2&r2=1.3&cvsroot=soc-2005>
  1.4       +14 -5     soc-blender/source/blender/src/fluidsim.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/src/fluidsim.c.diff?r1=1.3&r2=1.4&cvsroot=soc-2005>