Merge branch 'neon' of https://git.eclipse.org/r/chess/chess.git into
neon-orig Conflicts: plugins/mobius/org.polarsys.chess.mobius.model.edit/about.html plugins/mobius/org.polarsys.chess.mobius.model.editor/about.html plugins/mobius/org.polarsys.chess.mobius.model/about.html Change-Id: I05f2a0a72e85b7f545ee9ce16bc862925283dde1
No related branches found
No related tags found
Showing
- plugins/mobius/org.polarsys.chess.mobius.model.edit/about.html 17 additions, 25 deletions...ns/mobius/org.polarsys.chess.mobius.model.edit/about.html
- plugins/mobius/org.polarsys.chess.mobius.model.editor/about.html 17 additions, 25 deletions.../mobius/org.polarsys.chess.mobius.model.editor/about.html
- plugins/mobius/org.polarsys.chess.mobius.model/about.html 17 additions, 25 deletionsplugins/mobius/org.polarsys.chess.mobius.model/about.html
- plugins/mobius/org.polarsys.chess.mobius/src/org/polarsys/chess/mobius/handlers/CHESS2SANRunner.java 13 additions, 12 deletions...c/org/polarsys/chess/mobius/handlers/CHESS2SANRunner.java
- plugins/mobius/org.polarsys.chess.mobius/src/org/polarsys/chess/mobius/templates/projectFileTemplate_sanmodel.mtl 0 additions, 3 deletions...s/chess/mobius/templates/projectFileTemplate_sanmodel.mtl
- plugins/mobius/org.polarsys.chess.mobius/src/org/polarsys/chess/mobius/transformations/QVToTransformation.java 13 additions, 12 deletions...rsys/chess/mobius/transformations/QVToTransformation.java
- plugins/mobius/org.polarsys.chess.mobius/src/org/polarsys/chess/mobius/utils/QVTBlackBox.java 15 additions, 0 deletions...bius/src/org/polarsys/chess/mobius/utils/QVTBlackBox.java
- plugins/mobius/org.polarsys.chess.mobius/tasks/RewardTemplate.xml 0 additions, 154 deletions...mobius/org.polarsys.chess.mobius/tasks/RewardTemplate.xml
- plugins/mobius/org.polarsys.chess.mobius/tasks/RewardTemplateTarget.xml 0 additions, 19 deletions.../org.polarsys.chess.mobius/tasks/RewardTemplateTarget.xml
- plugins/mobius/org.polarsys.chess.mobius/tasks/atomicComponentRewardTemplate.xml 0 additions, 154 deletions...rsys.chess.mobius/tasks/atomicComponentRewardTemplate.xml
- plugins/mobius/org.polarsys.chess.mobius/tasks/atomicComponentTemplate.xml 0 additions, 154 deletions...g.polarsys.chess.mobius/tasks/atomicComponentTemplate.xml
- plugins/mobius/org.polarsys.chess.mobius/tasks/atomicComponentTemplateTarget.xml 0 additions, 19 deletions...rsys.chess.mobius/tasks/atomicComponentTemplateTarget.xml
- plugins/mobius/org.polarsys.chess.mobius/tasks/atomicComponentTemplate_fromSANmodel.xml 0 additions, 153 deletions...ess.mobius/tasks/atomicComponentTemplate_fromSANmodel.xml
- plugins/mobius/org.polarsys.chess.mobius/tasks/atomicComponentTemplate_sanmodel.xml 3 additions, 6 deletions...s.chess.mobius/tasks/atomicComponentTemplate_sanmodel.xml
- plugins/mobius/org.polarsys.chess.mobius/tasks/attackScenarioTemplate.xml 0 additions, 154 deletions...rg.polarsys.chess.mobius/tasks/attackScenarioTemplate.xml
- plugins/mobius/org.polarsys.chess.mobius/tasks/attackScenarioTemplateTarget.xml 0 additions, 19 deletions...arsys.chess.mobius/tasks/attackScenarioTemplateTarget.xml
- plugins/mobius/org.polarsys.chess.mobius/tasks/attackSimpleTemplate.xml 0 additions, 105 deletions.../org.polarsys.chess.mobius/tasks/attackSimpleTemplate.xml
- plugins/mobius/org.polarsys.chess.mobius/tasks/attackSimpleTemplateTarget.xml 0 additions, 19 deletions...olarsys.chess.mobius/tasks/attackSimpleTemplateTarget.xml
- plugins/mobius/org.polarsys.chess.mobius/tasks/attackTemplate.xml 0 additions, 105 deletions...mobius/org.polarsys.chess.mobius/tasks/attackTemplate.xml
- plugins/mobius/org.polarsys.chess.mobius/tasks/attackTemplateTarget.xml 0 additions, 19 deletions.../org.polarsys.chess.mobius/tasks/attackTemplateTarget.xml
Please register or sign in to comment