Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 8ad9bdc6 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

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

# Conflicts:
#	VECTO/GUI/GearboxForm.vb
#	VECTO/GUI/VectoJobForm.vb
#	VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
#	VECTOAux/VectoAuxiliariesTests/packages.config
#	VectoCommon/VectoHashingTest/VectoHashingTest.csproj
#	VectoCommon/VectoHashingTest/packages.config
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/Gearbox.cs
#	VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
#	VectoCore/VectoCore/Utils/VectoCSVFile.cs
#	VectoCore/VectoCore/Utils/VectoVersionCore.cs
#	VectoCore/VectoCore/VectoCore.csproj
#	VectoCore/VectoCore/VersionNumber.t4
#	VectoCore/VectoCoreTest/Models/SimulationComponent/ATGearboxTest.cs
#	VectoCore/VectoCoreTest/VectoCoreTest.csproj
#	VectoCore/VectoCoreTest/packages.config
parents 6be6c585 26637d5a
No related branches found
No related tags found
No related merge requests found
Showing
with 2309 additions and 4 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