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

Skip to content
Snippets Groups Projects
Commit fc2e426a authored by Harald Martini's avatar Harald Martini
Browse files

Merge branch 'develop' into merge_xev_develop

# 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
parent e5fba516
No related branches found
No related tags found
No related merge requests found
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
</packageSources>
</configuration>
\ No newline at end of file
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