Commits

Fabian Stark authored ea03b1897d2M
Merge branch 'feature/ilu_preconditioner' into feature/time_measurments Conflicts: src/Matrix.h src/main.cpp
Merge branch 'feature/ilu_preconditioner' into feature/time_measurments Conflicts: src/Matrix.h src/main.cpp