Merge remote-tracking branch 'origin/master' into visualModeling
Conflicts:
	AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java
	AlgebraicDataflowArchitectureModel/src/graphicalrefactor/views/GraphicalRefactorMenuBar.java
commit b1ea652c2b142e95baa97124ce249848d39d3eb9
2 parents c090a7a + f0e4a32
Naoya Nitta authored on 20 Feb 2023
Showing 8 changed files
View
AlgebraicDataflowArchitectureModel/models/Algolike.model 0 → 100644
View
AlgebraicDataflowArchitectureModel/src/algorithms/TypeInference.java
View
AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/DAGLayoutAction.java 0 → 100644
View
AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java
View
AlgebraicDataflowArchitectureModel/src/graphicalrefactor/layouts/DAGLayout.java 0 → 100644
View
AlgebraicDataflowArchitectureModel/src/graphicalrefactor/views/GraphicalRefactorMenuBar.java
View
AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java
View
AlgebraicDataflowArchitectureModel/src/models/dataFlowModel/ModelExtension.java