yade-dev team mailing list archive

[Anton Gladky <gladky.anton@xxxxxxxxx>]

  Branch: refs/heads/master
  Home:   https://github.com/yade/trunk
  Commit: 457d2be70be250ee909c55052048de10d89d5235
      https://github.com/yade/trunk/commit/457d2be70be250ee909c55052048de10d89d5235
  Author: Anton Gladky <gladky.anton@xxxxxxxxx>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    M core/Interaction.cpp
    M core/Interaction.hpp
    M pkg/dem/ViscoelasticPM.cpp

  Log Message:
  -----------
  Add isActive parameter to Interactions.


  Commit: dfcaef493ec7c0a22c3f84d5acb150249b25b97d
      https://github.com/yade/trunk/commit/dfcaef493ec7c0a22c3f84d5acb150249b25b97d
  Author: Anton Gladky <gladky.anton@xxxxxxxxx>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    M lib/triangulation/FlowBoundingSphere.hpp
    M lib/triangulation/FlowBoundingSphere.ipp
    M pkg/dem/FlowEngine.cpp
    M pkg/dem/FlowEngine.hpp

  Log Message:
  -----------
  Merge branch 'master' of github.com:yade/trunk


Compare: https://github.com/yade/trunk/compare/4e75e60...dfcaef4