Merge branch 'develop' of...
Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/vecto/vecto-sim into develop # Conflicts: # VectoCore/VectoCore/VectoCore.csproj
Showing
- VECTO/GUI/EngineForm.vb 14 additions, 1 deletionVECTO/GUI/EngineForm.vb
- VECTO/GUI/GearboxForm.vb 3 additions, 3 deletionsVECTO/GUI/GearboxForm.vb
- VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj 9 additions, 0 deletionsVECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
- VECTOAux/VectoAuxiliariesTests/packages.config 1 addition, 0 deletionsVECTOAux/VectoAuxiliariesTests/packages.config
- VectoCommon/VectoHashingTest/VectoHashingTest.csproj 9 additions, 0 deletionsVectoCommon/VectoHashingTest/VectoHashingTest.csproj
- VectoCommon/VectoHashingTest/packages.config 1 addition, 0 deletionsVectoCommon/VectoHashingTest/packages.config
- VectoCore/VectoCore/VectoCore.csproj 1 addition, 1 deletionVectoCore/VectoCore/VectoCore.csproj
- VectoCore/VectoCoreTest/VectoCoreTest.csproj 2 additions, 0 deletionsVectoCore/VectoCoreTest/VectoCoreTest.csproj
- VectoCore/VectoCoreTest/packages.config 1 addition, 0 deletionsVectoCore/VectoCoreTest/packages.config
Loading
Please register or sign in to comment