| commit | 1360a251321ec421ffa8f71a5f48194549613819 | [log] [tgz] |
|---|---|---|
| author | Alberto Debiasi <adebiasi@fbk.eu> | Thu May 21 14:57:34 2020 +0200 |
| committer | Alberto Debiasi <adebiasi@fbk.eu> | Thu May 21 14:57:34 2020 +0200 |
| tree | d6039686a0a119491a369daf8b7f87c14155c0d2 | |
| parent | 53a8e3565a413e5c8752db3493af241357306e6a [diff] | |
| parent | 7c0e39f5b711c5f79914b64aaae38d9ebfa55936 [diff] |
Merge remote-tracking branch 'origin/master' into neon Conflicts: plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/checkerManager/Checker.java plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/checkerManager/CheckerManager.java plugins/org.polarsys.chess.checkers/src/org/polarsys/chess/checkers/core/checkerManager/CheckersContainer.java Change-Id: I82322bd32ff90a6e98bc9d5f51609ec7fcf3856a