Skip to content
Snippets Groups Projects
Commit abd01133 authored by Gianmarco Mengaldo's avatar Gianmarco Mengaldo
Browse files

Merge branch 'master' into feature/3dh1dDiscontinuous 

Conflicts:
	library/MultiRegions/DisContField2D.cpp
	library/MultiRegions/DisContField3DHomogeneous1D.cpp
	library/MultiRegions/ExpList.h
	library/SolverUtils/EquationSystem.cpp
parents 02922c6a cb560829
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 704 additions and 63 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