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

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

Merge branch 'hm/feature/VECTO-1572-mockup-vecto-in-vecto-core' into...

Merge branch 'hm/feature/VECTO-1572-mockup-vecto-in-vecto-core' into hm/feature/VECTO-1638_merge-mockup-in-vecto-core

# Conflicts:
#	Documentation/User Manual Source/Release Notes Vecto3.x.pdf
#	VECTO.sln
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs
#	VectoCore/VectoCore/Ninject/VectoNinjectModule.cs
#	VectoCore/VectoCore/OutputData/XML/DeclarationReports/ManufacturerReport/ManufacturerReport_0_9/ManufacturerReportXMLTypeWriter/Components/MRFIEPCType.cs
#	VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFAngleDriveType.cs
#	VectoCore/VectoCore/VectoCore.csproj
#	VectoMockup/VectoMockup/VectoMockup.csproj
parents 43dbad12 19bd579d
No related branches found
No related tags found
No related merge requests found
Showing
with 22 additions and 39 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