← Back to team overview

yade-dev team mailing list archive

[yade/trunk] 4d2cf3: Merge pull request #11 from batzkass/master

 

  Branch: refs/heads/master
  Home:   https://github.com/yade/trunk
  Commit: 4d2cf3e7f9baaca44241497af5ff28a8311c34d6
      https://github.com/yade/trunk/commit/4d2cf3e7f9baaca44241497af5ff28a8311c34d6
  Author: Bruno Chareyre <bruno.chareyre@xxxxxxxxxxxxxxx>
  Date:   2012-04-10 (Tue, 10 Apr 2012)

  Changed paths:
    A pkg/common/CylScGeom6D.cpp
  A pkg/common/CylScGeom6D.hpp
  M pkg/common/Cylinder.cpp
  M pkg/common/Cylinder.hpp

  Log Message:
  -----------
  Merge pull request #11 from batzkass/master

Added the interaction between cohesive sphere and cohesive chained cylinder