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

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

# 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
parents dccceee3 12f802c0
No related branches found
No related tags found
No related merge requests found
Showing
with 220 additions and 28 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