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

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

# Conflicts:
#	Documentation/User Manual Source/Release Notes Vecto3.x.pdf
#	HashingTool/Properties/Version.cs
#	VECTO/GUI/GearboxForm.vb
#	VECTO/GUI/VectoJobForm.vb
#	VECTO/Input Files/Gearbox.vb
#	VECTO/OutputData/JSONFileWriter.vb
#	VECTO/VECTO.vbproj
#	VectoCommon/VectoCommon/Properties/Version.cs
#	VectoCommon/VectoHashing/Properties/Version.cs
#	VectoConsole/Properties/Version.cs
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationGearboxDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationJobInputDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/AbstractEngineeringXMLComponentDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringInputDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringJobInputDataProvider.cs
#	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
#	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
#	VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs
#	VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
#	VectoCore/VectoCore/Properties/Version.cs
#	VectoCore/VectoCore/Utils/VectoVersionCore.cs
#	VectoCore/VectoCore/VectoCore.csproj
#	VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs
#	VectoCore/VectoCoreTest/Utils/MockSimulationDataFactory.cs
parents 7ce730f2 4f24a0ed
No related branches found
No related tags found
No related merge requests found
Showing
with 84 additions and 26 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