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 7c9742cc authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

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

Conflicts:
	VECTO/File Browser/FB_Global.vb
	VECTO/GUI/F_VEH.Designer.vb
	VECTO/GUI/MainForm.vb
	VECTO/GUI/VehicleForm.vb
	VECTO/Input Files/cVEH.vb
	VECTO/VECTO_Types.vb
	VectoCore/VectoCore/InputData/Reader/ComponentData/RetarderLossMapReader.cs
	VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs
	VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
	VectoCore/VectoCore/Models/SimulationComponent/Data/CombustionEngineData.cs
	VectoCore/VectoCore/Models/SimulationComponent/Data/RetarderLossMap.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/ATGearbox.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
	VectoCore/VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs
	VectoCore/VectoCore/Utils/VectoCSVFile.cs
	VectoCore/VectoCore/VectoCore.csproj
	VectoCore/VectoCoreTest/Integration/ATPowerTrain.cs
parents 80b906b5 b8f9d8bb
No related branches found
No related tags found
No related merge requests found
Showing
with 0 additions and 476379 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