Branch: refs/heads/master
Home: https://github.com/yade/trunk
Commit: 10c9dd473b6e234e12953a5536295e6669e1628d
https://github.com/yade/trunk/commit/10c9dd473b6e234e12953a5536295e6669e1628d
Author: Bruno Chareyre <bruno.chare...@hmg.inpg.fr>
Date: 2012-07-11 (Wed, 11 Jul 2012)
Changed paths:
M lib/triangulation/FlowBoundingSphere.hpp
M lib/triangulation/FlowBoundingSphere.ipp
M lib/triangulation/PeriodicFlow.cpp
M lib/triangulation/PeriodicFlow.hpp
M pkg/dem/FlowEngine.cpp
M pkg/dem/FlowEngine.hpp
Log Message:
-----------
reverts commit afa59f17d59a90d3049b9c51c41d28e29fc9081e, which messed up flow
code.
This reverts commit afa59f17d59a90d3049b9c51c41d28e29fc9081e.
Conflicts:
lib/triangulation/PeriodicFlow.cpp
Commit: 6d276c7550f30e9b4ab4449dee4b5fb39bf6b0e7
https://github.com/yade/trunk/commit/6d276c7550f30e9b4ab4449dee4b5fb39bf6b0e7
Author: Bruno Chareyre <bruno.chare...@hmg.inpg.fr>
Date: 2012-07-11 (Wed, 11 Jul 2012)
Changed paths:
M lib/triangulation/PeriodicFlow.cpp
Log Message:
-----------
-fix conflict
Compare: https://github.com/yade/trunk/compare/0366bf7807e1...6d276c7550f3
_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : yade-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp
