Skip to content
Snippets Groups Projects
Commit a1f5006d authored by Christian Engwer's avatar Christian Engwer
Browse files

Merge branch 'master' into feature/gridglue

Conflicts:
	dune.module
	dune/pdelab/stationary/linearproblem.hh
parents 981280d9 0cee0ce4
No related branches found
No related tags found
No related merge requests found
Showing
with 17 additions and 156 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment