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

Skip to content
Snippets Groups Projects
Commit 5959fd1d authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Merge branch 'develop' of...

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

Conflicts:
	VectoCore/Models/Simulation/Cockpit/IEngineCockpit.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/Utils/Formulas.cs
	VectoCore/Utils/SI.cs
	VectoCoreTest/Models/SimulationComponent/MockPorts.cs
parents 50692143 0a7219fb
No related branches found
No related tags found
No related merge requests found
Showing
with 1140 additions and 821 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