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
No related branches found
No related tags found
Showing
- VECTO.sln 0 additions, 16 deletionsVECTO.sln
- VECTO/VECTO.vbproj 4 additions, 4 deletionsVECTO/VECTO.vbproj
- VECTO3GUI2020/VECTO3GUI2020.csproj 2 additions, 2 deletionsVECTO3GUI2020/VECTO3GUI2020.csproj
- VectoConsole/VectoConsole.csproj 4 additions, 4 deletionsVectoConsole/VectoConsole.csproj
- VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationComponentsDataProvider.cs 6 additions, 6 deletions...tion/DataProvider/XMLDeclarationComponentsDataProvider.cs
- VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricMotorDeclarationInputDataProvider.cs 5 additions, 6 deletions...aProvider/XMLElectricMotorDeclarationInputDataProvider.cs
- VectoCore/VectoCore/Mockup/MockupModalDataContainer.cs 0 additions, 0 deletionsVectoCore/VectoCore/Mockup/MockupModalDataContainer.cs
- VectoCore/VectoCore/Mockup/MockupResultReader.cs 1 addition, 1 deletionVectoCore/VectoCore/Mockup/MockupResultReader.cs
- VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_Conv_Bus.xml 0 additions, 0 deletions...oCore/Mockup/MockupResults/CIF_MockupResults_Conv_Bus.xml
- VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_Conv_Lorry.xml 0 additions, 0 deletions...ore/Mockup/MockupResults/CIF_MockupResults_Conv_Lorry.xml
- VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_OVC-HEV_Bus.xml 0 additions, 0 deletions...re/Mockup/MockupResults/CIF_MockupResults_OVC-HEV_Bus.xml
- VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_OVC-HEV_Lorry.xml 0 additions, 0 deletions.../Mockup/MockupResults/CIF_MockupResults_OVC-HEV_Lorry.xml
- VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_PEV_Bus.xml 0 additions, 0 deletions...toCore/Mockup/MockupResults/CIF_MockupResults_PEV_Bus.xml
- VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_PEV_Lorry.xml 0 additions, 0 deletions...Core/Mockup/MockupResults/CIF_MockupResults_PEV_Lorry.xml
- VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Bus.xml 0 additions, 0 deletions...ockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Bus.xml
- VectoCore/VectoCore/Mockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Lorry.xml 0 additions, 0 deletions...kup/MockupResults/CIF_MockupResults_non-OVC-HEV_Lorry.xml
- VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_Conv_Bus.xml 0 additions, 0 deletions...oCore/Mockup/MockupResults/MRF_MockupResults_Conv_Bus.xml
- VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_Conv_Lorry.xml 0 additions, 0 deletions...ore/Mockup/MockupResults/MRF_MockupResults_Conv_Lorry.xml
- VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_Error.xml 0 additions, 0 deletions...ectoCore/Mockup/MockupResults/MRF_MockupResults_Error.xml
- VectoCore/VectoCore/Mockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml 0 additions, 0 deletions...re/Mockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml
Loading
Please register or sign in to comment