• Radu Popescu's avatar
    Merge branch 'master' into static_graph · 948fa42a
    Radu Popescu authored
    Conflicts:
    	lifev/eta/CMakeLists.txt
    	lifev/eta/expression/IntegrateMatrixElement.hpp
    	lifev/eta/expression/IntegrateVectorElement.hpp
    	lifev/eta/testsuite/CMakeLists.txt
    948fa42a