• Dave Moxey's avatar
    Merge branch 'master' into feature/collections · 2efc499e
    Dave Moxey authored
    Conflicts:
    	cmake/Nektar++Config.cmake.in
    	library/LocalRegions/PrismExp.cpp
    	library/SpatialDomains/MeshGraph.cpp
    	library/StdRegions/StdExpansion.h
    	library/StdRegions/StdExpansion3D.cpp
    	library/StdRegions/StdPrismExp.cpp
    	library/StdRegions/StdQuadExp.cpp
    	library/StdRegions/StdQuadExp.h
    	library/StdRegions/StdTetExp.cpp
    	library/StdRegions/StdTriExp.cpp
    2efc499e
CMakeLists.txt 10.8 KB