Merge branch 'develop' into merge_1503_develop_27_04_22
# Conflicts: # VectoCommon/VectoCommon/Models/PowertrainPosition.cs # VectoCommon/VectoCommon/VectoCommon.csproj # VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationHeavyLorryVehicleDataProvider.cs # VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/v24/XMLDeclarationPrimaryBusVehicleDataProvider.cs # VectoCore/VectoCore/VectoCore.csproj # VectoCore/VectoCore/packages.config # VectoCore/VectoCoreTest/VectoCoreTest.csproj
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 3 deletions.gitignore
- .vs/config/applicationhost.config 0 additions, 1030 deletions.vs/config/applicationhost.config
- Build/CommonSettings.targets 0 additions, 6 deletionsBuild/CommonSettings.targets
- Build/Packaging.targets 0 additions, 150 deletionsBuild/Packaging.targets
- Build/TextPreProcessing.targets 0 additions, 11 deletionsBuild/TextPreProcessing.targets
- Directory.Build.props 44 additions, 0 deletionsDirectory.Build.props
- Directory.Build.targets 121 additions, 0 deletionsDirectory.Build.targets
- Documentation/User Manual/1-user-interface/0_start.md 1 addition, 1 deletionDocumentation/User Manual/1-user-interface/0_start.md
- Documentation/User Manual/1-user-interface/B_mainform.md 8 additions, 8 deletionsDocumentation/User Manual/1-user-interface/B_mainform.md
- Documentation/User Manual/1-user-interface/C_settings.md 5 additions, 5 deletionsDocumentation/User Manual/1-user-interface/C_settings.md
- Documentation/User Manual/1-user-interface/D1_VECTO-Job-Editor.md 10 additions, 10 deletions...ation/User Manual/1-user-interface/D1_VECTO-Job-Editor.md
- Documentation/User Manual/1-user-interface/D2_VTP-Job-Editor.md 5 additions, 5 deletions...ntation/User Manual/1-user-interface/D2_VTP-Job-Editor.md
- Documentation/User Manual/1-user-interface/E_VECTO-Editor_Aux.md 8 additions, 8 deletions...tation/User Manual/1-user-interface/E_VECTO-Editor_Aux.md
- Documentation/User Manual/1-user-interface/F_VEH-Editor.md 27 additions, 26 deletionsDocumentation/User Manual/1-user-interface/F_VEH-Editor.md
- Documentation/User Manual/1-user-interface/G_ENG-Editor.md 9 additions, 9 deletionsDocumentation/User Manual/1-user-interface/G_ENG-Editor.md
- Documentation/User Manual/1-user-interface/H1_HybridStrategyParams-Editor.md 3 additions, 3 deletions...Manual/1-user-interface/H1_HybridStrategyParams-Editor.md
- Documentation/User Manual/1-user-interface/H_GBX-Editor.md 14 additions, 14 deletionsDocumentation/User Manual/1-user-interface/H_GBX-Editor.md
- Documentation/User Manual/1-user-interface/I_Graph.md 5 additions, 5 deletionsDocumentation/User Manual/1-user-interface/I_Graph.md
- Documentation/User Manual/1-user-interface/L_ElectricMotor.md 6 additions, 6 deletions...mentation/User Manual/1-user-interface/L_ElectricMotor.md
- Documentation/User Manual/1-user-interface/M_BatteryPackEditor.md 9 additions, 9 deletions...ation/User Manual/1-user-interface/M_BatteryPackEditor.md
Loading
Please register or sign in to comment