Skip to content
  • Jan Philipp Haller's avatar
    Merge branch 'master' into Haller · 204e9b2d
    Jan Philipp Haller authored
    # Conflicts:
    #	pom.xml
    #	src/main/java/de/monticore/lang/monticar/generator/cpp/mathopt/optimizationSolver/problem/ProblemAssignmentHandler.java
    #	src/main/java/de/monticore/lang/monticar/generator/cpp/mathopt/optimizationSolver/solver/ipopt/IpoptSolverGeneratorImplementation.java
    #	src/main/resources/template/cmake/CMakeListsCppTemplate.ftl
    204e9b2d