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

Skip to content
Snippets Groups Projects
Commit 637c9e12 authored by Markus QUARITSCH's avatar Markus QUARITSCH
Browse files

Merge branch 'VECTO_CERT/master' into merge/Vecto_3.3.10

# Conflicts:
#	.gitignore
#	Documentation/User Manual Source/Release Notes Vecto3.x.pdf
#	Documentation/User Manual Source/Release Notes Vecto3.x.pptx
#	HashingTool/Properties/Version.cs
#	VECTO/Input Files/Engine.vb
#	VECTO/Input Files/Gearbox.vb
#	VECTO/Input Files/Vehicle.vb
#	VectoCommon/VectoCommon/Properties/Version.cs
#	VectoCommon/VectoCommon/Resources/XMLNames.resx
#	VectoCommon/VectoHashing/Properties/Version.cs
#	VectoConsole/Properties/Version.cs
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONEngineData.cs
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONGearboxData.cs
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationReaderInjectModule.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
#	VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs
#	VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs
#	VectoCore/VectoCore/Models/Declaration/WeightingGroups.cs
#	VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
#	VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs
#	VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
#	VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs
#	VectoCore/VectoCore/OutputData/XML/XMLMonitoringReport.cs
#	VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs
#	VectoCore/VectoCore/Properties/Version.cs
#	VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd
#	VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd
#	VectoCore/VectoCore/Resources/XSD/VectoMonitoring.xsd
#	VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.xsd
#	VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.xsd
#	VectoCore/VectoCore/Utils/VectoVersionCore.cs
#	VectoCore/VectoCore/Utils/XMLDefinitions.cs
#	VectoCore/VectoCore/VectoCore.csproj
#	VectoCore/VectoCore/VersionNumber.t4
#	VectoCore/VectoXML.spp
parents fdcc2103 3ba4c6fe
No related branches found
No related tags found
No related merge requests found
Showing
with 126 additions and 12 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