Merge branch 'develop' into feature/VECTO-53-read-and-write-datafiles
Conflicts: VectoCoreTest/VectoCoreTest.csproj VectoCoreTest/app.config
Showing
- VectoCore/Models/SimulationComponent/SimulationComponentData.cs 8 additions, 0 deletions...ore/Models/SimulationComponent/SimulationComponentData.cs
- VectoCore/VectoCore.csproj 4 additions, 2 deletionsVectoCore/VectoCore.csproj
- VectoCore/app.config 33 additions, 0 deletionsVectoCore/app.config
- VectoCore/packages.config 1 addition, 1 deletionVectoCore/packages.config
- VectoCoreTest/VectoCoreTest.csproj 22 additions, 4 deletionsVectoCoreTest/VectoCoreTest.csproj
- VectoCoreTest/app.config 31 additions, 1 deletionVectoCoreTest/app.config
- VectoCoreTest/packages.config 7 additions, 0 deletionsVectoCoreTest/packages.config
Loading
Please register or sign in to comment