Merge branch 'develop' into feature/VECTO-1455_MergeDevelop
# Conflicts: # VectoCore/VectoCore/VectoCore.csproj # 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 46 additions, 0 deletionsDirectory.Build.props
- Directory.Build.targets 121 additions, 0 deletionsDirectory.Build.targets
- HashingCmd/App.config 0 additions, 14 deletionsHashingCmd/App.config
- HashingCmd/HashingCmd.csproj 12 additions, 78 deletionsHashingCmd/HashingCmd.csproj
- HashingCmd/Properties/AssemblyInfo.cs 0 additions, 67 deletionsHashingCmd/Properties/AssemblyInfo.cs
- HashingCmd/Properties/Version.cs 0 additions, 34 deletionsHashingCmd/Properties/Version.cs
- HashingCmd/Properties/Version.tt 0 additions, 40 deletionsHashingCmd/Properties/Version.tt
- HashingTool/HashingTool.csproj 14 additions, 252 deletionsHashingTool/HashingTool.csproj
- HashingTool/Helper/BrowserHelper.cs 0 additions, 84 deletionsHashingTool/Helper/BrowserHelper.cs
- HashingTool/MainWindow.xaml.cs 4 additions, 7 deletionsHashingTool/MainWindow.xaml.cs
- HashingTool/Properties/Annotations.cs 0 additions, 1027 deletionsHashingTool/Properties/Annotations.cs
- HashingTool/Properties/AssemblyInfo.cs 0 additions, 84 deletionsHashingTool/Properties/AssemblyInfo.cs
- HashingTool/Properties/Resources.Designer.cs 0 additions, 91 deletionsHashingTool/Properties/Resources.Designer.cs
- HashingTool/Properties/Resources.resx 0 additions, 117 deletionsHashingTool/Properties/Resources.resx
- HashingTool/Properties/Settings.Designer.cs 0 additions, 51 deletionsHashingTool/Properties/Settings.Designer.cs
Loading
Please register or sign in to comment