Merge branch 'release' into master

Former-commit-id: c79bc51bca
This commit is contained in:
Malte Rosenbjerg 2020-10-27 01:01:12 +01:00 committed by GitHub
commit 8efa3ff32c

View file

@ -6,9 +6,9 @@
<PackageProjectUrl>https://github.com/rosenbjerg/FFMpegCore</PackageProjectUrl>
<Copyright></Copyright>
<Description>A .NET Standard FFMpeg/FFProbe wrapper for easily integrating media analysis and conversion into your C# applications</Description>
<Version>1.0.12</Version>
<AssemblyVersion>1.1.0.0</AssemblyVersion>
<FileVersion>1.1.0.0</FileVersion>
<Version>3.0.0.0</Version>
<AssemblyVersion>3.0.0.0</AssemblyVersion>
<FileVersion>3.0.0.0</FileVersion>
<PackageReleaseNotes>- Fix hanging pipes on unix sockets
- Internal API cleanup</PackageReleaseNotes>
<LangVersion>8</LangVersion>