| commit | ef12441b0546525e75cf7d154984954099ee2f33 | [log] [tgz] |
|---|---|---|
| author | Alberto Debiasi <adebiasi@fbk.eu> | Wed May 13 15:53:06 2020 +0200 |
| committer | Alberto Debiasi <adebiasi@fbk.eu> | Wed May 13 15:53:06 2020 +0200 |
| tree | fe52c2bad33ceb727b418e1a54dd82a86b03809a | |
| parent | 71cb82391683085ad8f51cf633e6de11354ffdad [diff] | |
| parent | 171964864636a8cbed0849f8216d7b6f728d8271 [diff] |
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