Resolved Merge conficts
Showing
- Build/Packaging.targets 1 addition, 1 deletionBuild/Packaging.targets
- Documentation/BusAuxCases with ESS_Formatted.xlsx 0 additions, 0 deletionsDocumentation/BusAuxCases with ESS_Formatted.xlsx
- Documentation/User Manual/3-simulation-models/ADAS_EcoRoll.md 12 additions, 8 deletions...mentation/User Manual/3-simulation-models/ADAS_EcoRoll.md
- Documentation/User Manual/3-simulation-models/Engine_FC_Correction.md 153 additions, 21 deletions...n/User Manual/3-simulation-models/Engine_FC_Correction.md
- Documentation/User Manual/5-input-and-output-files/VMOD.md 45 additions, 36 deletionsDocumentation/User Manual/5-input-and-output-files/VMOD.md
- Documentation/User Manual/5-input-and-output-files/VSUM.md 36 additions, 31 deletionsDocumentation/User Manual/5-input-and-output-files/VSUM.md
- Documentation/User Manual/convert.bat 2 additions, 0 deletionsDocumentation/User Manual/convert.bat
- Documentation/User Manual/help.html 600 additions, 405 deletionsDocumentation/User Manual/help.html
- Documentation/User Manual/pics/BusAux_PS_kAir.png 0 additions, 0 deletionsDocumentation/User Manual/pics/BusAux_PS_kAir.png
- Documentation/User Manual/pics/FC_Correction.PNG 0 additions, 0 deletionsDocumentation/User Manual/pics/FC_Correction.PNG
- VECTO/GUI/BatteryForm.vb 24 additions, 15 deletionsVECTO/GUI/BatteryForm.vb
- VECTO/GUI/ElectricMotorForm.Designer.vb 389 additions, 147 deletionsVECTO/GUI/ElectricMotorForm.Designer.vb
- VECTO/GUI/ElectricMotorForm.vb 56 additions, 39 deletionsVECTO/GUI/ElectricMotorForm.vb
- VECTO/GUI/MainForm.Designer.vb 132 additions, 140 deletionsVECTO/GUI/MainForm.Designer.vb
- VECTO/GUI/REESSPackDialog.Designer.vb 198 additions, 0 deletionsVECTO/GUI/REESSPackDialog.Designer.vb
- VECTO/GUI/REESSPackDialog.resx 139 additions, 0 deletionsVECTO/GUI/REESSPackDialog.resx
- VECTO/GUI/REESSPackDialog.vb 101 additions, 0 deletionsVECTO/GUI/REESSPackDialog.vb
- VECTO/GUI/VehicleForm.Designer.vb 112 additions, 109 deletionsVECTO/GUI/VehicleForm.Designer.vb
- VECTO/GUI/VehicleForm.resx 0 additions, 18 deletionsVECTO/GUI/VehicleForm.resx
- VECTO/GUI/VehicleForm.vb 66 additions, 43 deletionsVECTO/GUI/VehicleForm.vb
Loading
Please register or sign in to comment