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

Merge branch... 

Merge branch 'hm/feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev' into feature/VECTO-1671-declaration-mode-for-xev-buses

# Conflicts:
#	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs
#	VectoCore/VectoCore/JsonKeys.Designer.cs
#	VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
#	VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricComponents/Battery/BatteryData.cs
#	VectoCore/VectoCore/OutputData/IModalDataContainer.cs
#	VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd
#	VectoCore/VectoCoreTest/VectoCoreTest.csproj
parents 2e86e615 0aa210ba
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1409 additions and 1031 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about