• Alexander Diewald's avatar
    Merge remote-tracking branch 'origin/master' into 3767 · 1500ea47
    Alexander Diewald authored
    Conflicts:
    	org.fortiss.af3.cosimulation.ui/META-INF/MANIFEST.MF
    	org.fortiss.af3.generator.common/META-INF/MANIFEST.MF
    	org.fortiss.af3.mira.ui/META-INF/MANIFEST.MF
    	org.fortiss.af3.mode/META-INF/MANIFEST.MF
    	org.fortiss.af3.operatorpanel.ui/META-INF/MANIFEST.MF
    	org.fortiss.af3.operatorpanel/META-INF/MANIFEST.MF
    	org.fortiss.af3.safety.ui/META-INF/MANIFEST.MF
    	org.fortiss.af3.safetycases.ui/META-INF/MANIFEST.MF
    	org.fortiss.af3.safetycases/META-INF/MANIFEST.MF
    	org.fortiss.af3.state.ui/META-INF/MANIFEST.MF
    	org.fortiss.af3.state/META-INF/MANIFEST.MF
    Signed-off-by: Alexander Diewald's avatarAlexander Diewald <diewald@fortiss.org>
    1500ea47
MANIFEST.MF 1 KB