Merge branch 'ohta'
Conflicts:
	AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java
commit 0c1835a7e3b88fb7266c59dee6af4ce8ab85b6a3
2 parents 339a9b1 + e940a5e
yoichiro authored on 6 Apr 2020
Showing 5 changed files
View
AlgebraicDataflowArchitectureModel/src/algorithm/CodeGenerator.java
View
AlgebraicDataflowArchitectureModel/src/algorithm/EdgeTransitionSelectable.java
View
AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/PrototypeGenerateAction.java
View
AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java
View
AlgebraicDataflowArchitectureModel/src/tests/CodeGeneratorTest.java