VectoConsole/Components/Retarder.vrlm · 7e9e9b3a95ee6f8c58a3c54ce953b097080fea29 · Stefanos DOUMPOULAKIS / Vecto

Forked from VECTO / VECTO Sim

Source project has a limited visibility.

9 years ago

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

Michael KRISPER authored 9 years ago

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

9616090e

History

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

Michael KRISPER authored 9 years ago

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

Code owners

Assign users and groups as approvers for specific file changes. Learn more.