Skip to content
Snippets Groups Projects
  • Simon Barner's avatar
    3309f481
    Merge branch 'master' of https://git.fortiss.org/af3/exploration-alg · 3309f481
    Simon Barner authored
    into 3337
    
    Conflicts:
    	org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/modeltransformation/comparch/.ratings
    	org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/modeltransformation/deployment/.ratings
    	org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/modeltransformation/deployment/DeploymentFinalizer.java
    	org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/.ratings
    	org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/AF3SystemModelAdapter.java
    	org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/plot/.ratings
    	org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/util/.ratings
    	org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/util/TransformationUtils.java
    
    
    Signed-off-by: default avatarSimon Barner <barner@fortiss.org>
    3309f481
    History
    Merge branch 'master' of https://git.fortiss.org/af3/exploration-alg
    Simon Barner authored
    into 3337
    
    Conflicts:
    	org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/modeltransformation/comparch/.ratings
    	org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/modeltransformation/deployment/.ratings
    	org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/modeltransformation/deployment/DeploymentFinalizer.java
    	org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/.ratings
    	org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/dse/sysmodel/arch/af3/AF3SystemModelAdapter.java
    	org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/plot/.ratings
    	org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/util/.ratings
    	org.fortiss.af3.exploration.alg/src/org/fortiss/af3/exploration/alg/util/TransformationUtils.java
    
    
    Signed-off-by: default avatarSimon Barner <barner@fortiss.org>