|
Merge branch 'commonToControlFlowAndDependencyModelings' into hierarchical-control-flow-modeling
# Conflicts: # AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/ControlFlowGraph.java |
|---|
| AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/StatefulObjectNode.java |
|---|