Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 239c4b56 authored by Raphael LUZ's avatar Raphael LUZ
Browse files

Merge branch 'develop' of...

Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emluzraph/vecto-sim into feature/VECTO-84-vectosimulation-for-clutch-engine-only

Conflicts:
	VectoCore/Models/Connector/Ports/ITnOutPort.cs
	VectoCore/Models/Simulation/Cockpit/IEngineCockpit.cs
	VectoCore/Models/Simulation/Impl/SimulatorFactory.cs
	VectoCore/Models/Simulation/Impl/VehicleContainer.cs
	VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
	VectoCore/Models/SimulationComponent/Data/Engine/FullLoadCurve.cs
	VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
	VectoCore/Models/SimulationComponent/Impl/EngineOnlyAuxiliary.cs
	VectoCore/Models/SimulationComponent/Impl/EngineOnlyGearbox.cs
	VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
	VectoCore/Utils/SI.cs
	VectoCore/VectoCore.csproj
	VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs
	VectoCoreTest/Models/SimulationComponent/MockPorts.cs
parents 1f399b62 df440576
No related branches found
No related tags found
No related merge requests found
Showing
with 205 additions and 90 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment