Merge remote-tracking branch 'origin/master' into visualModeling
Conflicts: AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java AlgebraicDataflowArchitectureModel/src/graphicalrefactor/views/GraphicalRefactorMenuBar.java
FACS2023
Models2024
SimulatorVisualization
bug-pathParam
bug-swingNativeReceiver
controlFlowModeling
dynamicResourceCreation
experiment20231128
extendForWebServices
feature-addTableUI
feature-keyboard-shortcuts
feature_addLoggerToCFD
fix-window-position
fixSerializeException
fix_connectionAnEdgeAtDependsOnMediator
forWebServices
gameEngine
gameEngine-DTRAM
gameEngine2
generatorBugFix4
hieararchicalLayout
htmlGUi
master
moveCharacters
refactor
simulationLayout
simulator
simulatorAddFunctions
swingInterface
test
two-stage-modeling
update-dtram-parser
updateHierarchicalResources
|
---|
AlgebraicDataflowArchitectureModel/models/Algolike.model 0 → 100644 |
---|
AlgebraicDataflowArchitectureModel/src/algorithms/TypeInference.java |
---|
AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/DAGLayoutAction.java 0 → 100644 |
---|
AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java |
---|
AlgebraicDataflowArchitectureModel/src/graphicalrefactor/layouts/DAGLayout.java 0 → 100644 |
---|
AlgebraicDataflowArchitectureModel/src/graphicalrefactor/views/GraphicalRefactorMenuBar.java |
---|
AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java |
---|
AlgebraicDataflowArchitectureModel/src/models/dataFlowModel/ModelExtension.java |
---|