| commit | 3a639de72945ba21fc556b582223f63d0bfe4c42 | [log] [tgz] |
|---|---|---|
| author | Alberto Debiasi <adebiasi@fbk.eu> | Fri May 03 09:41:41 2019 +0200 |
| committer | Alberto Debiasi <adebiasi@fbk.eu> | Fri May 03 09:41:41 2019 +0200 |
| tree | d4500d619ded4f9cd40437b3de4c2283eb30a85f | |
| parent | 3f3e0779bdb2b729cccc60c1eff654fa24dcc1bb [diff] | |
| parent | a95d0c3adf086ab112d0097f4999a6ec41ab0057 [diff] |
Merge branch 'master' into neon Conflicts: plugins/org.polarsys.chess.chessmlprofile/model/CHESS.profile.notation plugins/org.polarsys.chess.chessmlprofile/model/CHESS.profile.uml plugins/org.polarsys.chess.paramArchConfigurator/bin/org/polarsys/chess/paramArchConfigurator/commands/InstantiateParamArchAsOssFileCommand.class Change-Id: I44b2a2941a5842318545b88b582aebd97cc1244b