tree 3a70eeaf299cdfdd0a1eab7134fe85606579d3d2
parent 69fa32c42fc02a4b0d30a0319e57d50b51fc718f
parent 1269e823e2fff91d7de200191530b9e59f4c8976
author Alberto Debiasi <adebiasi@fbk.eu> 1584548235 +0100
committer Alberto Debiasi <adebiasi@fbk.eu> 1584548235 +0100

Merge remote-tracking branch 'origin/master' into neon

Conflicts:
	plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generate.xml
	plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generateErrorModel.xml
	plugins/contracts/org.polarsys.chess.contracts.transformations/tasks/generateFaultExtensions.xml
	plugins/org.polarsys.chess.codegen.ada/tasks/generateInfrastructure.xml
	plugins/org.polarsys.chess.paramArchConfigurator/bin/org/polarsys/chess/paramArchConfigurator/commands/InstantiateParamArchAsOssFileCommand.class

Change-Id: I0cc046654e50be0cffd12bb2df0b669fb4df147a