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

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

Merge branch 'feature/VECTO-112-simple-shifting-strategy' into...

Merge branch 'feature/VECTO-112-simple-shifting-strategy' into feature/VECTO-113-commandline-interface

Conflicts:
	VectoCore/FileIO/Reader/DataObjectAdaper/AbstractSimulationDataAdapter.cs
	VectoCore/Models/SimulationComponent/Data/Engine/EngineFullLoadCurve.cs
	VectoCore/Models/SimulationComponent/Data/Gearbox/ShiftPolygon.cs
	VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
	VectoCore/Models/SimulationComponent/Impl/Driver.cs
	VectoCore/Utils/DelauneyMap.cs
	VectoCore/VectoCore.csproj
	VectoCoreTest/app.config
parents 3f978526 c335aaf5
No related branches found
No related tags found
No related merge requests found
Showing
with 1658 additions and 224 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