Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

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
Branches
Tags
No related merge requests found
Showing
with 1 addition and 0 deletions
...@@ -205,6 +205,7 @@ Documentation/VehiclesReleaseComparisonDeclarationMode/*.vsum ...@@ -205,6 +205,7 @@ Documentation/VehiclesReleaseComparisonDeclarationMode/*.vsum
HashingTool/TestData/ HashingTool/TestData/
DISTR/ DISTR/
[0-9][0-9][0-9][0-9]_[0-9][0-9]_[0-9][0-9]-VECTO-*.zip [0-9][0-9][0-9][0-9]_[0-9][0-9]_[0-9][0-9]-VECTO-*.zip
Documentation/VehiclesReleaseComparisonDeclarationMode/tmp/
EPTP/ EPTP/
201*-VECTO-*.zip 201*-VECTO-*.zip
Documentation/VehiclesReleaseComparisonDeclarationMode/tmp/ Documentation/VehiclesReleaseComparisonDeclarationMode/tmp/
......
No preview for this file type
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment