.gitignore · 85bd94c8746f65812b5ff631f6ac014255189f52 · Stefanos DOUMPOULAKIS / Vecto

Forked from VECTO / VECTO Sim

Source project has a limited visibility.

6 years ago

Merge branch 'vecto-cert/master' into dev/AMT_ShiftStrategy · 4ff04810

# Conflicts:
#	.gitignore
#	VECTO/GUI/VectoJobForm.vb
#	VECTO/Input Files/VectoJob.vb
#	VectoCore/VectoCore/InputData/Reader/ComponentData/TransmissionLossMapReader.cs
#	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
#	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
#	VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
#	VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
#	VectoCore/VectoCore/Models/Declaration/LookupData.cs
#	VectoCore/VectoCore/Models/Declaration/Segments.cs
#	VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
#	VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/AbstractGearbox.cs
#	VectoCore/VectoCore/VectoCore.csproj
#	VectoCore/VectoCore/VersionNumber.t4
#	VectoCore/VectoCoreTest/VectoCoreTest.csproj

4ff04810

History

Merge branch 'vecto-cert/master' into dev/AMT_ShiftStrategy

Markus Quaritsch authored 6 years ago

# Conflicts:
#	.gitignore
#	VECTO/GUI/VectoJobForm.vb
#	VECTO/Input Files/VectoJob.vb
#	VectoCore/VectoCore/InputData/Reader/ComponentData/TransmissionLossMapReader.cs
#	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
#	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
#	VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
#	VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
#	VectoCore/VectoCore/Models/Declaration/LookupData.cs
#	VectoCore/VectoCore/Models/Declaration/Segments.cs
#	VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
#	VectoCore/VectoCore/Models/Simulation/Impl/VehicleContainer.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/AbstractGearbox.cs
#	VectoCore/VectoCore/VectoCore.csproj
#	VectoCore/VectoCore/VersionNumber.t4
#	VectoCore/VectoCoreTest/VectoCoreTest.csproj

Code owners

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