Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # VectoCore/VectoCore/Models/SimulationComponent/VectoSimulationComponent.cs # VectoCore/VectoCoreTest/Reports/ModDataTest.cs
No related branches found
No related tags found
Showing
- HashingCmd/Program.cs 33 additions, 2 deletionsHashingCmd/Program.cs
- HashingCmd/Properties/AssemblyInfo.cs 32 additions, 1 deletionHashingCmd/Properties/AssemblyInfo.cs
- HashingCmd/Properties/Version.cs 1 addition, 1 deletionHashingCmd/Properties/Version.cs
- HashingTool/App.xaml.cs 31 additions, 8 deletionsHashingTool/App.xaml.cs
- HashingTool/MainWindow.xaml.cs 32 additions, 16 deletionsHashingTool/MainWindow.xaml.cs
- HashingTool/Properties/AssemblyInfo.cs 32 additions, 1 deletionHashingTool/Properties/AssemblyInfo.cs
- HashingTool/Properties/Resources.Designer.cs 30 additions, 9 deletionsHashingTool/Properties/Resources.Designer.cs
- HashingTool/Properties/Settings.Designer.cs 30 additions, 9 deletionsHashingTool/Properties/Settings.Designer.cs
- HashingTool/Properties/Version.cs 1 addition, 1 deletionHashingTool/Properties/Version.cs
- VECTO.sln.DotSettings 2 additions, 0 deletionsVECTO.sln.DotSettings
- VECTO/ApplicationEvents.vb 0 additions, 6 deletionsVECTO/ApplicationEvents.vb
- VECTO/Configuration.vb 0 additions, 1 deletionVECTO/Configuration.vb
- VECTO/GUI/AboutBox.Designer.vb 6 additions, 60 deletionsVECTO/GUI/AboutBox.Designer.vb
- VECTO/GUI/AboutBox.vb 0 additions, 2 deletionsVECTO/GUI/AboutBox.vb
- VECTO/GUI/EngineForm.Designer.vb 36 additions, 36 deletionsVECTO/GUI/EngineForm.Designer.vb
- VECTO/GUI/EngineForm.vb 2 additions, 2 deletionsVECTO/GUI/EngineForm.vb
- VECTO/GUI/FileSignDialog.Designer.vb 0 additions, 361 deletionsVECTO/GUI/FileSignDialog.Designer.vb
- VECTO/GUI/FileSignDialog.resx 0 additions, 145 deletionsVECTO/GUI/FileSignDialog.resx
- VECTO/GUI/FileSignDialog.vb 0 additions, 225 deletionsVECTO/GUI/FileSignDialog.vb
- VECTO/GUI/GearboxForm.vb 1 addition, 1 deletionVECTO/GUI/GearboxForm.vb
Loading
Please register or sign in to comment