| commit | 19e7bca407cc3b4933bff7adbdbe0fa38a69121a | [log] [tgz] |
|---|---|---|
| author | Alberto Debiasi <adebiasi@fbk.eu> | Fri May 08 17:57:25 2020 +0200 |
| committer | Alberto Debiasi <adebiasi@fbk.eu> | Fri May 08 17:57:25 2020 +0200 |
| tree | de04f9a3455e2acfae3a59e4d30101f246048c0f | |
| parent | 7748a2a7763e8c79f9f45b176ea0731228116447 [diff] | |
| parent | 70f213d2ef7812ff18bbe43799ed6423b0f50c01 [diff] |
Merge remote-tracking branch 'origin/master' into neon Conflicts: plugins/contracts/org.polarsys.chess.contracts.verificationService.test.runtime/META-INF/MANIFEST.MF plugins/org.polarsys.chess.feature/feature.xml Change-Id: I039c9268bc4bf89bb40dab2a17d639602824444c