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

Skip to content
Snippets Groups Projects
Commit 2a3c5f78 authored by Michael KRISPER's avatar Michael KRISPER
Browse files

Merge remote-tracking branch 'vecto/develop' into feature/VECTO-323-pto-idle-losses 

# Conflicts:
#	VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
#	VectoCore/VectoCore/VectoCore.csproj
parents 46df8df9 778bdd0b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 359 additions and 222 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about