Merge branch 'neon' of https://git.eclipse.org/r/chess/chess.git into
neon Conflicts: plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslDescriptionLabelProvider.xtend plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/labeling/FlaDslLabelProvider.xtend plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/outline/FlaDslOutlineTreeProvider.xtend plugins/fla/org.polarsys.chess.xtext.fladsl.ui/src/org/polarsys/chess/xtext/ui/quickfix/FlaDslQuickfixProvider.xtend plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/GenerateFlaDsl.mwe2 plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/formatting/FlaDslFormatter.xtend plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/generator/FlaDslGenerator.xtend plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/scoping/FlaDslScopeProvider.xtend plugins/fla/org.polarsys.chess.xtext.fladsl/src/org/polarsys/chess/xtext/validation/FlaDslValidator.xtend Change-Id: I5315768ba10a0377a053fa5244c92cb75ed528bb
No related branches found
No related tags found
Showing
- plugins/contracts/org.polarsys.chess.contracts.transformations/plugin.properties 2 additions, 2 deletions...olarsys.chess.contracts.transformations/plugin.properties
- plugins/contracts/org.polarsys.chess.contracts.transformations/plugin.xml 2 additions, 2 deletions...s/org.polarsys.chess.contracts.transformations/plugin.xml
- plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/Activator.java 2 additions, 2 deletions...g/polarsys/chess/contracts/transformations/Activator.java
- plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/AbstractXSapHandler.java 2 additions, 2 deletions...ntracts/transformations/commands/AbstractXSapHandler.java
- plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CHESSContractValidateAndRefineCommand.java 2 additions, 2 deletions...tions/commands/CHESSContractValidateAndRefineCommand.java
- plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CHESSContractValidatePropertyCommand.java 2 additions, 2 deletions...ations/commands/CHESSContractValidatePropertyCommand.java
- plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CHESSContractValidatePropertyHandler.java 2 additions, 2 deletions...ations/commands/CHESSContractValidatePropertyHandler.java
- plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CHESSContractValidationAndRefinementHandler.java 2 additions, 2 deletions...commands/CHESSContractValidationAndRefinementHandler.java
- plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CheckImplHandler.java 2 additions, 2 deletions.../contracts/transformations/commands/CheckImplHandler.java
- plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CheckRefHandler.java 2 additions, 2 deletions...s/contracts/transformations/commands/CheckRefHandler.java
- plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CheckValidPropHandler.java 2 additions, 2 deletions...racts/transformations/commands/CheckValidPropHandler.java
- plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/CommandsCommon.java 2 additions, 2 deletions...ss/contracts/transformations/commands/CommandsCommon.java
- plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/ExportSmv.java 140 additions, 133 deletions...s/chess/contracts/transformations/commands/ExportSmv.java
- plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/FMEAXSapHandler.java 2 additions, 2 deletions...s/contracts/transformations/commands/FMEAXSapHandler.java
- plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/FTANuSMV3Handler.java 2 additions, 2 deletions.../contracts/transformations/commands/FTANuSMV3Handler.java
- plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/commands/FTAXSapHandler.java 2 additions, 2 deletions...ss/contracts/transformations/commands/FTAXSapHandler.java
- plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/RefinementResultDialog.java 2 additions, 2 deletions...racts/transformations/dialogs/RefinementResultDialog.java
- plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/SelectAnalysisCtxDialog.java 2 additions, 2 deletions...acts/transformations/dialogs/SelectAnalysisCtxDialog.java
- plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/SelectFTAFMEAAnalysisCtxDialog.java 2 additions, 2 deletions...ansformations/dialogs/SelectFTAFMEAAnalysisCtxDialog.java
- plugins/contracts/org.polarsys.chess.contracts.transformations/src/org/polarsys/chess/contracts/transformations/dialogs/SelectImplementationDialog.java 2 additions, 2 deletions...s/transformations/dialogs/SelectImplementationDialog.java
Loading
Please register or sign in to comment