• Simon Barner's avatar
    Merge branch 'master' of https://git.fortiss.org/af3/af3.git into 3891 · 83f96745
    Simon Barner authored
    Conflicts:
    	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/.ratings
    	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/AF3MiraUIActivator.java
    	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/constraints/.ratings
    	org.fortiss.af3.mira/META-INF/MANIFEST.MF
    	org.fortiss.af3.mira/model/mira.ecore
    	org.fortiss.af3.mira/model/mira.genmodel
    	org.fortiss.af3.mira/plugin.xml
    	org.fortiss.af3.mira/src/org/fortiss/af3/mira/.ratings
    	org.fortiss.af3.mira/src/org/fortiss/af3/mira/AF3MiraActivator.java
    	org.fortiss.af3.mira/src/org/fortiss/af3/mira/utils/.ratings
    	org.fortiss.af3.mira/src/org/fortiss/af3/mira/utils/MiraModelElementFactory.java
    	org.fortiss.af3.mira/src/org/fortiss/af3/mira/utils/MiraUtils.java
    	org.fortiss.af3.project/model/.ratings
    	org.fortiss.af3.project/src/org/fortiss/af3/project/utils/.ratings
    	org.fortiss.af3.project/src/org/fortiss/af3/project/utils/ProjectModelElementFactory.java
    	org.fortiss.af3.safetycases/src/org/fortiss/af3/safetycases/.ratings
    Signed-off-by: Simon Barner's avatarSimon Barner <barner@fortiss.org>
    83f96745
Name
Last commit
Last update
..
.settings @ 310d1c04 Loading commit data...
META-INF Loading commit data...
html/developer Loading commit data...
model Loading commit data...
src/org/fortiss/af3 Loading commit data...
.classpath Loading commit data...
.project Loading commit data...
build.properties Loading commit data...
plugin.properties Loading commit data...
plugin.xml Loading commit data...