Merge branch 'Products/RoadSweepers' into Merge/RoadSweepers
# Conflicts: # VECTO.sln # VECTO/GUI/MainForm.Designer.vb # VectoCore/VectoCore/InputData/Reader/DrivingCycleDataReader.cs # VectoCore/VectoCore/Utils/VectoVersionCore.cs
No related branches found
No related tags found
Showing
- VECTO/File Browser/FileBrowserModule.vb 1 addition, 0 deletionsVECTO/File Browser/FileBrowserModule.vb
- VECTO/GUI/MainForm.Designer.vb 26 additions, 15 deletionsVECTO/GUI/MainForm.Designer.vb
- VECTO/GUI/MainForm.resx 0 additions, 3 deletionsVECTO/GUI/MainForm.resx
- VECTO/GUI/MainForm.vb 3 additions, 0 deletionsVECTO/GUI/MainForm.vb
- VECTO/GUI/VectoJobForm.Designer.vb 1229 additions, 1190 deletionsVECTO/GUI/VectoJobForm.Designer.vb
- VECTO/GUI/VectoJobForm.resx 89 additions, 71 deletionsVECTO/GUI/VectoJobForm.resx
- VECTO/GUI/VectoJobForm.vb 14 additions, 1 deletionVECTO/GUI/VectoJobForm.vb
- VECTO/GUI/VehicleForm.Designer.vb 120 additions, 34 deletionsVECTO/GUI/VehicleForm.Designer.vb
- VECTO/GUI/VehicleForm.vb 6 additions, 0 deletionsVECTO/GUI/VehicleForm.vb
- VECTO/Input Files/VectoJob.vb 22 additions, 0 deletionsVECTO/Input Files/VectoJob.vb
- VECTO/Input Files/Vehicle.vb 17 additions, 2 deletionsVECTO/Input Files/Vehicle.vb
- VECTO/OutputData/JSONFileWriter.vb 14 additions, 0 deletionsVECTO/OutputData/JSONFileWriter.vb
- VECTO/app.config 2 additions, 2 deletionsVECTO/app.config
- VectoCommon/VectoCommon/InputData/EngineeringInputData.cs 9 additions, 0 deletionsVectoCommon/VectoCommon/InputData/EngineeringInputData.cs
- VectoCommon/VectoCommon/Utils/EnumHelper.cs 20 additions, 20 deletionsVectoCommon/VectoCommon/Utils/EnumHelper.cs
- VectoCore/VectoCore/Configuration/Constants.cs 3 additions, 1 deletionVectoCore/VectoCore/Configuration/Constants.cs
- VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs 12 additions, 0 deletions...VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
- VectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs 11 additions, 0 deletionsVectoCore/VectoCore/InputData/FileIO/JSON/JSONInputData.cs
- VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs 8 additions, 0 deletionsVectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
- VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringJobInputDataProvider.cs 3 additions, 0 deletions...eering/DataProvider/XMLEngineeringJobInputDataProvider.cs
Loading
Please register or sign in to comment