Просмотр исходного кода
Merge branch 'master' into issue_doc_structure
Conflicts: plugins/com.yakindu.sct.domain.c.runtime/src/com/yakindu/sct/domain/c/runtime/generator/CStateMachineHeader.xtend plugins/com.yakindu.sct.domain.c.ui/META-INF/MANIFEST.MF plugins/com.yakindu.sct.generator.headless/.gitignore plugins/com.yakindu.sct.generator.headless/src/com/yakindu/sct/generator/headless/impl/HeadlessJavaCodeGenerator.java releng/com.yakindu.sctpro.releng/pom.xml
Johannes Dicks
8 измененных файлов с 4041 добавлено и 4073 удалено