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

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

Merge branch 'develop' into test 

# Conflicts:
#	VECTO/Input Files/Engine.vb
#	VECTO/Input Files/Vehicle.vb
#	VectoCommon/VectoCommon/BusAuxiliaries/ISSMDeclarationInputs.cs
#	VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONSubComponent.cs
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/IXMLDeclarationInputDataReader.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationInputReader.cs
#	VectoCore/VectoCore/VectoCore.csproj
parents 1319cacd b3fc8049
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 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