Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS will be completely phased out by mid-2025. 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
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 102218 additions and 110130 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