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

Skip to content
Snippets Groups Projects
Commit 3dbed026 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-77-vectosimulationcomponent-for-auxiliaries

Conflicts:
	VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
	VectoCoreTest/Integration/EngineOnlyCycle/EngineOnlyCycleTest.cs
	VectoCoreTest/VectoCoreTest.csproj
parents 02137cd6 1aa472c6
No related branches found
No related tags found
No related merge requests found
Showing
with 655 additions and 499 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