Merge branch 'vecto-cert/develop' into dev/AMT_ShiftStrategy
# Conflicts: # Documentation/User Manual Source/Release Notes Vecto3.x.pdf # HashingTool/Properties/Version.cs # VECTO/GUI/GearboxForm.vb # VECTO/GUI/VectoJobForm.vb # VECTO/Input Files/Gearbox.vb # VECTO/OutputData/JSONFileWriter.vb # VECTO/VECTO.vbproj # VectoCommon/VectoCommon/Properties/Version.cs # VectoCommon/VectoHashing/Properties/Version.cs # VectoConsole/Properties/Version.cs # VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs # VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationGearboxDataProvider.cs # VectoCore/VectoCore/InputData/FileIO/XML/Declaration/XMLDeclarationJobInputDataProvider.cs # VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/AbstractEngineeringXMLComponentDataProvider.cs # VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringInputDataProvider.cs # VectoCore/VectoCore/InputData/FileIO/XML/Engineering/XMLEngineeringJobInputDataProvider.cs # VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapter.cs # VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs # VectoCore/VectoCore/InputData/Reader/Impl/EngineeringModeVectoRunDataFactory.cs # VectoCore/VectoCore/Models/Declaration/DeclarationData.cs # VectoCore/VectoCore/Properties/Version.cs # VectoCore/VectoCore/Utils/VectoVersionCore.cs # VectoCore/VectoCore/VectoCore.csproj # VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs # VectoCore/VectoCoreTest/Utils/MockSimulationDataFactory.cs
No related branches found
No related tags found
Showing
- Documentation/Checklist_Release_VECTO_3.3.2.1548.docx 0 additions, 0 deletionsDocumentation/Checklist_Release_VECTO_3.3.2.1548.docx
- Documentation/Checklist_Release_VECTO_3.3.2.1548.pdf 0 additions, 0 deletionsDocumentation/Checklist_Release_VECTO_3.3.2.1548.pdf
- Documentation/User Manual Source/Release Notes Vecto3.x.pdf 0 additions, 0 deletionsDocumentation/User Manual Source/Release Notes Vecto3.x.pdf
- Documentation/User Manual Source/Release Notes Vecto3.x.pptx 0 additions, 0 deletionsDocumentation/User Manual Source/Release Notes Vecto3.x.pptx
- Documentation/User Manual/1-user-interface/F_VEH-Editor.md 8 additions, 0 deletionsDocumentation/User Manual/1-user-interface/F_VEH-Editor.md
- Documentation/User Manual/3-simulation-models/ADAS_EcoRoll.md 2 additions, 2 deletions...mentation/User Manual/3-simulation-models/ADAS_EcoRoll.md
- Documentation/User Manual/3-simulation-models/Vehicle_ADAS_technologies.md 1 addition, 1 deletion...r Manual/3-simulation-models/Vehicle_ADAS_technologies.md
- Documentation/User Manual/6-changelog/changelog.md 13 additions, 1 deletionDocumentation/User Manual/6-changelog/changelog.md
- Documentation/User Manual/help.html 22 additions, 6 deletionsDocumentation/User Manual/help.html
- Documentation/User Manual/pics/VEH-Editor.PNG 0 additions, 0 deletionsDocumentation/User Manual/pics/VEH-Editor.PNG
- Documentation/VectoResults_3.3.2.1548.xlsx 0 additions, 0 deletionsDocumentation/VectoResults_3.3.2.1548.xlsx
- Documentation/VehiclesReleaseComparisonDeclarationMode/Class_9_RigidTruck_AT_Decl.xml 1 addition, 1 deletion...eComparisonDeclarationMode/Class_9_RigidTruck_AT_Decl.xml
- HashingCmd/App.config 9 additions, 1 deletionHashingCmd/App.config
- HashingCmd/Program.cs 4 additions, 4 deletionsHashingCmd/Program.cs
- HashingTool/App.config 9 additions, 1 deletionHashingTool/App.config
- HashingTool/Properties/Version.cs 2 additions, 2 deletionsHashingTool/Properties/Version.cs
- HashingTool/Util/AsyncXMLValidator.cs 1 addition, 1 deletionHashingTool/Util/AsyncXMLValidator.cs
- HashingTool/ViewModel/HashComponentDataViewModel.cs 1 addition, 4 deletionsHashingTool/ViewModel/HashComponentDataViewModel.cs
- HashingTool/ViewModel/UserControl/XMLFileSelector.cs 2 additions, 1 deletionHashingTool/ViewModel/UserControl/XMLFileSelector.cs
- Tools/DeclarationCycleZip/App.config 9 additions, 1 deletionTools/DeclarationCycleZip/App.config
Loading
Please register or sign in to comment