| commit | ce3fc3fb1d2b2f6bc669ab1d79f00c1270cc5684 | [log] [tgz] |
|---|---|---|
| author | Stefano Puri <stefano.puri@intecs.it> | Wed Oct 12 15:09:17 2016 +0200 |
| committer | Stefano Puri <stefano.puri@intecs.it> | Wed Oct 12 15:09:17 2016 +0200 |
| tree | 2ffb7a88dc6bf9180d4d7443e6403168b719c5e9 | |
| parent | d4bc43e9cec5cb71900be26af5a6efd1358a3bae [diff] | |
| parent | 436ef1641b3eedceb036ea0b8fdb2d310a528e56 [diff] |
Merge branch 'develop' Conflicts: plugins/org.polarsys.chess.core/src/org/polarsys/chess/core/profiles/CHESSProfileManager.java plugins/org.polarsys.chess.validator/src/org/polarsys/chess/validator/managers/ModelParser.java