[Soc-2005-cvs] CVS commit: soc-blender/extern/bullet/Bullet Bullet3_vc8.vcproj soc-blender/extern/bullet/Bullet/NarrowPhaseCollision VoronoiSimplexSolver.cpp soc-blender/extern/bullet/Demos/ConcaveDemo ConcaveDemo_vc8.vcproj soc-blender/extern/bullet/Demos/Raytracer Raytracer.cpp soc-blender/source/blender/blenkernel BKE_modifier.h soc-blender/source/blender/blenkernel/intern modifier.c

[Chris Want]

hos (Chris Want) 2005/07/25 04:22:13 CEST

  Modified files:
    soc-blender/extern/bullet/Bullet Bullet3_vc8.vcproj 
    soc-blender/extern/bullet/Bullet/NarrowPhaseCollision 
                                                          VoronoiSimplexSolver.cpp 
    soc-blender/extern/bullet/Demos/ConcaveDemo 
                                                ConcaveDemo_vc8.vcproj 
    soc-blender/extern/bullet/Demos/Raytracer Raytracer.cpp 
    soc-blender/source/blender/blenkernel BKE_modifier.h 
    soc-blender/source/blender/blenkernel/intern modifier.c 
  
  Log:
  Post-merge conflict resolution
  
  Revision  Changes    Path
  1.2       +8 -9      soc-blender/extern/bullet/Bullet/Bullet3_vc8.vcproj
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/Bullet3_vc8.vcproj.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
  1.2       +11 -0     soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/VoronoiSimplexSolver.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Bullet/NarrowPhaseCollision/VoronoiSimplexSolver.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
  1.2       +1 -8      soc-blender/extern/bullet/Demos/ConcaveDemo/ConcaveDemo_vc8.vcproj
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Demos/ConcaveDemo/ConcaveDemo_vc8.vcproj.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
  1.2       +17 -7     soc-blender/extern/bullet/Demos/Raytracer/Raytracer.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/extern/bullet/Demos/Raytracer/Raytracer.cpp.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
  1.2       +69 -17    soc-blender/source/blender/blenkernel/BKE_modifier.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/blenkernel/BKE_modifier.h.diff?r1=1.1&r2=1.2&cvsroot=soc-2005>
  1.2       +666 -55   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.1&r2=1.2&cvsroot=soc-2005>