-
Chris Cantwell authored
Conflicts: CHANGELOG.md library/MultiRegions/DisContField3DHomogeneous1D.cpp library/MultiRegions/Preconditioner.h library/MultiRegions/PreconditionerLowEnergy.cpp library/StdRegions/StdExpansion.cpp library/StdRegions/StdExpansion.h
49f7b585