• Kilian Lackhove's avatar
    Merge branch 'master' into feature/Coupling · 7311a5b1
    Kilian Lackhove authored
    # Conflicts:
    #	library/LibUtilities/BasicUtils/ErrorUtil.hpp
    #	library/LibUtilities/Communication/CommMpi.h
    #	library/SolverUtils/CMakeLists.txt
    #	solvers/APESolver/EquationSystems/APE.cpp
    7311a5b1
ErrorUtil.hpp 7.76 KB