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>
@@ -59,19 +59,12 @@
<ItemGroup>
<Compile Include="DiscFerret.cs" />
<Compile Include="DiscImageChef.cs" />
<Compile Include="Enums.cs" />
<Compile Include="Exceptions.cs" />
<Compile Include="HDCopy.cs" />
<Compile Include="IFloppyImage.cs" />
<Compile Include="IWritableFloppyImage.cs" />
<Compile Include="IWritableImage.cs" />
<Compile Include="KryoFlux.cs" />
<Compile Include="Apple2MG.cs" />
<Compile Include="CDRWin.cs" />
<Compile Include="DiskCopy42.cs" />
<Compile Include="IMediaImage.cs" />
<Compile Include="Nero.cs" />
<Compile Include="Structs.cs" />
<Compile Include="SuperCardPro.cs" />
<Compile Include="TeleDisk.cs" />
<Compile Include="VHD.cs" />
@@ -146,14 +139,6 @@
<Project>{D571B8EF-903D-4353-BDD5-B834F9F029EF}</Project>
<Name>DiscImageChef.Filters</Name>
</ProjectReference>
<ProjectReference Include="..\DiscImageChef.Interop\DiscImageChef.Interop.csproj">
<Project>{9183f2e0-a879-4f23-9ee3-c6908f1332b2}</Project>
<Name>DiscImageChef.Interop</Name>
</ProjectReference>
<ProjectReference Include="..\DiscImageChef.Metadata\DiscImageChef.Metadata.csproj">
<Project>{9F213318-5CB8-4066-A757-074489C9F818}</Project>
<Name>DiscImageChef.Metadata</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\LICENSE.LGPL">