Skip to content
Find file Blame History Permalink
  • Chris Cantwell's avatar
    Merge branch 'master' into scalapack · 07b57448
    Chris Cantwell authored 
    Conflicts:
	library/Demos/MultiRegions/CMakeLists.txt
	library/LibUtilities/BasicUtils/SessionReader.cpp
	library/MultiRegions/AssemblyMap/AssemblyMapCG2D.cpp
	library/MultiRegions/GlobalLinSys.cpp
    07b57448