Merge branch 'develop' of https://code.europa.eu/vecto/vecto-engine into ROOT/develop
# Conflicts: # Libraries/VectoCommon.dll # Libraries/VectoCore.dll # Libraries/VectoHashing.dll
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- VECTO-Engine/App.config 5 additions, 5 deletionsVECTO-Engine/App.config
- VECTO-Engine/Extension.vb 43 additions, 0 deletionsVECTO-Engine/Extension.vb
- VECTO-Engine/Form1.Designer.vb 195 additions, 194 deletionsVECTO-Engine/Form1.Designer.vb
- VECTO-Engine/Form1.vb 422 additions, 134 deletionsVECTO-Engine/Form1.vb
- VECTO-Engine/My Project/Resources.Designer.vb 2 additions, 1 deletionVECTO-Engine/My Project/Resources.Designer.vb
- VECTO-Engine/My Project/Settings.Designer.vb 26 additions, 26 deletionsVECTO-Engine/My Project/Settings.Designer.vb
- VECTO-Engine/Resources/JSONKeys.Designer.vb 1 addition, 1 deletionVECTO-Engine/Resources/JSONKeys.Designer.vb
- VECTO-Engine/Resources/XMLNames.Designer.vb 1 addition, 1 deletionVECTO-Engine/Resources/XMLNames.Designer.vb
- VECTO-Engine/VECTO-Engine.vbproj 4 additions, 1 deletionVECTO-Engine/VECTO-Engine.vbproj
- VECTO-Engine/VersionNumber.t4 1 addition, 1 deletionVECTO-Engine/VersionNumber.t4
- VECTO-Engine/cJSONparser.vb 61 additions, 20 deletionsVECTO-Engine/cJSONparser.vb
- VECTO-Engine/cJob.vb 75 additions, 68 deletionsVECTO-Engine/cJob.vb
- VECTO-Engine/cMAP0.vb 79 additions, 33 deletionsVECTO-Engine/cMAP0.vb
- VectoEngineTest/TestData/ExpectedResults/Dual fuel+WHR_el.xml 684 additions, 684 deletions...oEngineTest/TestData/ExpectedResults/Dual fuel+WHR_el.xml
- VectoEngineTest/TestData/ExpectedResults/Dual fuel+WHR_ice.xml 675 additions, 675 deletions...EngineTest/TestData/ExpectedResults/Dual fuel+WHR_ice.xml
- VectoEngineTest/TestData/ExpectedResults/Dual fuel+WHR_mech.xml 684 additions, 684 deletions...ngineTest/TestData/ExpectedResults/Dual fuel+WHR_mech.xml
- VectoEngineTest/TestData/ExpectedResults/Dual fuel.xml 675 additions, 675 deletionsVectoEngineTest/TestData/ExpectedResults/Dual fuel.xml
- VectoEngineTest/TestData/ExpectedResults/H2 Dual fuel.xml 678 additions, 0 deletionsVectoEngineTest/TestData/ExpectedResults/H2 Dual fuel.xml
- VectoEngineTest/TestData/ExpectedResults/H2Single fuel.xml 489 additions, 0 deletionsVectoEngineTest/TestData/ExpectedResults/H2Single fuel.xml
Loading
Please register or sign in to comment