Skip to content
  • Malte Heithoff's avatar
    Merge branch 'master' into semantics · aeb57dcf
    Malte Heithoff authored
    # Conflicts:
    #	pom.xml
    #	src/main/java/de/monticore/lang/monticar/generator/cpp/GeneratorCPP.java
    #	src/main/java/de/monticore/lang/monticar/generator/cpp/GeneratorCppCli.java
    aeb57dcf