Skip to content
  • Alberto Debiasi's avatar
    e03a17a9
    Merge remote-tracking branch 'origin/devel' into · e03a17a9
    Alberto Debiasi authored
    115-porting-to-latest-eclipse-and-papyrus-release
    
    Conflicts:
    	plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/META-INF/MANIFEST.MF
    	plugins/contracts/org.polarsys.chess.contracts.verificationService/META-INF/MANIFEST.MF
    	plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/META-INF/MANIFEST.MF
    	plugins/org.polarsys.chess.diagram.ui/META-INF/MANIFEST.MF
    	plugins/org.polarsys.chess.instance.view/.classpath
    	plugins/org.polarsys.chess.instance.view/.settings/org.eclipse.jdt.core.prefs
    	plugins/org.polarsys.chess.instance.view/META-INF/MANIFEST.MF
    	plugins/org.polarsys.chess.instance.view/src/org/polarsys/chess/instance/view/InstanceViewPart.java
    	plugins/org.polarsys.chess.m2m/META-INF/MANIFEST.MF
    e03a17a9
    Merge remote-tracking branch 'origin/devel' into
    Alberto Debiasi authored
    115-porting-to-latest-eclipse-and-papyrus-release
    
    Conflicts:
    	plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/META-INF/MANIFEST.MF
    	plugins/contracts/org.polarsys.chess.contracts.verificationService/META-INF/MANIFEST.MF
    	plugins/fla/org.polarsys.chess.fla.faultTreeGenerator/META-INF/MANIFEST.MF
    	plugins/org.polarsys.chess.diagram.ui/META-INF/MANIFEST.MF
    	plugins/org.polarsys.chess.instance.view/.classpath
    	plugins/org.polarsys.chess.instance.view/.settings/org.eclipse.jdt.core.prefs
    	plugins/org.polarsys.chess.instance.view/META-INF/MANIFEST.MF
    	plugins/org.polarsys.chess.instance.view/src/org/polarsys/chess/instance/view/InstanceViewPart.java
    	plugins/org.polarsys.chess.m2m/META-INF/MANIFEST.MF
Loading