Merge branch 'master' into alcoholfix

This commit is contained in:
2018-07-20 20:50:20 +01:00
committed by GitHub
419 changed files with 1774 additions and 1204 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>
@@ -115,10 +115,7 @@
</MonoDevelop>
</ProjectExtensions>
<ItemGroup>
<ProjectReference Include="..\DiscImageChef.Interop\DiscImageChef.Interop.csproj">
<Project>{9183F2E0-A879-4F23-9EE3-C6908F1332B2}</Project>
<Name>DiscImageChef.Interop</Name>
</ProjectReference>
<ProjectReference Include="..\DiscImageChef.CommonTypes\DiscImageChef.CommonTypes.csproj" />
<ProjectReference Include="..\DiscImageChef.Console\DiscImageChef.Console.csproj">
<Project>{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}</Project>
<Name>DiscImageChef.Console</Name>