Skip to content
Snippets Groups Projects
Commit 69585aa5 authored by Sebastian Eibl's avatar Sebastian Eibl
Browse files

Merge branch 'dem' into 'master'

Switchable integrator and contact resolution for DEM

See merge request !32
parents ee5d54e6 2150f2b7
Branches
Tags
No related merge requests found
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment