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

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

Merge remote-tracking branch...

Merge remote-tracking branch 'IVT-GIT/feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev' into feature/VECTO-1651-result-generation-method-for-xml

# Conflicts:
#	Documentation/User Manual Source/Release Notes Vecto3.x.pdf
#	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/SimulationComponents/GearBoxDataAdapter.cs
#	VectoCore/VectoCore/InputData/Reader/Impl/DeclarationMode/HeavyLorryRunDataFactory/DeclarationModeHeavyLorryRunDataFactory.cs
#	VectoCore/VectoCore/InputData/Reader/VectoRunDataFactoryFactory.cs
#	VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
#	VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
#	VectoCore/VectoCore/OutputData/IModalDataContainer.cs
#	VectoCore/VectoCoreTest/InputData/DeclarationDataAdapterTest/DeclarationDataAdapterTest.cs
#	VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs
#	VectoCore/VectoCoreTest/VectoCoreTest.csproj
parents 2276e177 e5fba516
No related branches found
No related tags found
No related merge requests found
Showing
with 417 additions and 98 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