Merge branch 'master' into alcoholfix

This commit is contained in:
2018-07-20 20:50:20 +01:00
committed by GitHub
14 changed files with 14 additions and 62 deletions

View File

@@ -12,7 +12,7 @@
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<TargetFramework>net461</TargetFramework>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>4.5.1.1692</Version>
<Version>4.5.99.1693</Version>
<Company>Claunia.com</Company>
<Copyright>Copyright © 2011-2018 Natalia Portillo</Copyright>
<Product>The Disc Image Chef</Product>
@@ -46,7 +46,6 @@
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
<Compile Include="IChecksum.cs" />
<Compile Include="SpamSumContext.cs" />
<Compile Include="Adler32Context.cs" />
<Compile Include="CDChecksums.cs" />
@@ -63,6 +62,7 @@
<Compile Include="SHA512Context.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DiscImageChef.CommonTypes\DiscImageChef.CommonTypes.csproj" />
<ProjectReference Include="..\DiscImageChef.Helpers\DiscImageChef.Helpers.csproj">
<Project>{F8BDF57B-1571-4CD0-84B3-B422088D359A}</Project>
<Name>DiscImageChef.Helpers</Name>