Skip to content
Snippets Groups Projects
Commit 8664bea6 authored by Martin Schneider's avatar Martin Schneider
Browse files

Merge branch 'master' into 'feature/box-adaptive' 

# Conflicts:
#   dumux/implicit/adaptive/gridadapt.hh
parents c8fef4d3 94db2f8c
1 merge request!219Feature/box adaptive
Hide whitespace changes
Inline Side-by-side
Showing
with 136 additions and 64 deletions
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