Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

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

Merge remote-tracking branch 'vecto/develop' into feature/VECTO-194-performance

Conflicts:
	VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
	VectoCore/VectoCoreTest/Integration/BusAuxiliaries/SimpleCycleTest.cs
	VectoCore/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestCoach.cs
	VectoCore/VectoCoreTest/Integration/DriverStrategy/DriverStrategyTestTruck.cs
	VectoCore/VectoCoreTest/Integration/SimpleDrivingCycles.cs
	VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach.vsum
	VectoCore/VectoCoreTest/TestData/Results/Integration/job.vsum
	VectoCore/VectoCoreTest/Utils/GraphWriter.cs
parents 62e72475 2a93f57e
Branches
Tags
No related merge requests found
Showing
with 102218 additions and 110130 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment