Merge branch 'ohta'
Conflicts: AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java |
---|
AlgebraicDataflowArchitectureModel/src/algorithm/CodeGenerator.java |
---|
AlgebraicDataflowArchitectureModel/src/algorithm/EdgeTransitionSelectable.java |
---|
AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/PrototypeGenerateAction.java |
---|
AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java |
---|
AlgebraicDataflowArchitectureModel/src/tests/CodeGeneratorTest.java |
---|