VECTO/GUI/VehicleForm.resx · 250c3ea675ce7fea734c0aeef1629a45479682f2 · Stefanos DOUMPOULAKIS / Vecto

Forked from VECTO / VECTO Sim

Source project has a limited visibility.

8 years ago

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

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

7c9742cc

History

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

Markus Quaritsch authored 8 years ago

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

Code owners

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