| commit | 0832e622fa2e65f0d72aa22ab22bef439da4ca35 | [log] [tgz] |
|---|---|---|
| author | Alberto Debiasi <adebiasi@fbk.eu> | Thu Jun 04 11:47:24 2020 +0200 |
| committer | Alberto Debiasi <adebiasi@fbk.eu> | Thu Jun 04 11:47:24 2020 +0200 |
| tree | be578fca4df1c88287ffec384ea968b1a464b09c | |
| parent | 1d5655f59444f22f91dc91bec38283d5be106212 [diff] | |
| parent | 12b037594abfec83e15db4de4587c9d8dba26767 [diff] |
Merge remote-tracking branch 'Polarsys/neon' into polarsys-master Conflicts: plugins/org.polarsys.chess.statebased/ATL/CHESS2IM.atl plugins/org.polarsys.chess.statebased/transformations/CHESS2IM.asm Change-Id: I9963be6caa9b074e54ef3b23044d3c6a405d0fc2