Merge branch 'develop' into feature/VECTO-1579-create-json-filewriter-for-iepc
# Conflicts: # VECTO/File Browser/FileBrowserModule.vb # VECTO/GUI/MainForm.Designer.vb # VECTO/GUI/MainForm.vb # VECTO/GUI/VehicleForm.Designer.vb # VECTO/GUI/VehicleForm.vb # VectoCommon/VectoCommon/InputData/EngineeringInputData.cs
No related branches found
No related tags found
Showing
- VECTO/File Browser/FileBrowserModule.vb 5 additions, 0 deletionsVECTO/File Browser/FileBrowserModule.vb
- VECTO/GUI/IHPCForm.Designer.vb 1322 additions, 0 deletionsVECTO/GUI/IHPCForm.Designer.vb
- VECTO/GUI/IHPCForm.resx 260 additions, 0 deletionsVECTO/GUI/IHPCForm.resx
- VECTO/GUI/IHPCForm.vb 198 additions, 0 deletionsVECTO/GUI/IHPCForm.vb
- VECTO/GUI/IHPCPowerMapInputDialog.Designer.vb 186 additions, 0 deletionsVECTO/GUI/IHPCPowerMapInputDialog.Designer.vb
- VECTO/GUI/IHPCPowerMapInputDialog.resx 139 additions, 0 deletionsVECTO/GUI/IHPCPowerMapInputDialog.resx
- VECTO/GUI/IHPCPowerMapInputDialog.vb 72 additions, 0 deletionsVECTO/GUI/IHPCPowerMapInputDialog.vb
- VECTO/GUI/MainForm.Designer.vb 7 additions, 0 deletionsVECTO/GUI/MainForm.Designer.vb
- VECTO/GUI/MainForm.vb 11 additions, 0 deletionsVECTO/GUI/MainForm.vb
- VECTO/GUI/VehicleForm.Designer.vb 2359 additions, 2366 deletionsVECTO/GUI/VehicleForm.Designer.vb
- VECTO/GUI/VehicleForm.resx 18 additions, 0 deletionsVECTO/GUI/VehicleForm.resx
- VECTO/GUI/VehicleForm.vb 19 additions, 0 deletionsVECTO/GUI/VehicleForm.vb
- VECTO/GUI/XMLImportJobDialog.vb 21 additions, 21 deletionsVECTO/GUI/XMLImportJobDialog.vb
- VectoCommon/VectoCommon/InputData/EngineeringInputData.cs 2 additions, 1 deletionVectoCommon/VectoCommon/InputData/EngineeringInputData.cs
- VectoCommon/VectoCommon/Models/GearboxType.cs 2 additions, 0 deletionsVectoCommon/VectoCommon/Models/GearboxType.cs
- VectoCommon/VectoCommon/Models/PowertrainPosition.cs 8 additions, 2 deletionsVectoCommon/VectoCommon/Models/PowertrainPosition.cs
- VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs 20 additions, 3 deletionsVectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
- VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs 2 additions, 0 deletions...e/VectoCore/InputData/FileIO/JSON/JSONInputDataFactory.cs
- VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs 10 additions, 0 deletionsVectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
- VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs 47 additions, 15 deletions...utData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
Loading
Please register or sign in to comment