Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--msvc/monoposixhelper.targets3
-rw-r--r--msvc/monoposixhelper.targets.filters9
-rw-r--r--support/README.zlib16
3 files changed, 12 insertions, 16 deletions
diff --git a/msvc/monoposixhelper.targets b/msvc/monoposixhelper.targets
index e56d0fb2fc9..52646e02e35 100644
--- a/msvc/monoposixhelper.targets
+++ b/msvc/monoposixhelper.targets
@@ -29,14 +29,13 @@
<ClInclude Include="$(MonoSourceLocation)\support\inffast.h" />
<ClInclude Include="$(MonoSourceLocation)\support\crc32.h" />
<ClInclude Include="$(MonoSourceLocation)\support\deflate.h" />
- <ClInclude Include="$(MonoSourceLocation)\support\gzguts.h" />
+ <ClInclude Include="$(MonoSourceLocation)\support\gzguts.h" />
<ClInclude Include="$(MonoSourceLocation)\support\inffixed.h" />
<ClInclude Include="$(MonoSourceLocation)\support\inflate.h" />
<ClInclude Include="$(MonoSourceLocation)\support\inftrees.h" />
<ClInclude Include="$(MonoSourceLocation)\support\map.h" />
<ClInclude Include="$(MonoSourceLocation)\support\minizip\crypt.h" />
<ClInclude Include="$(MonoSourceLocation)\support\minizip\ioapi.h" />
- <ClInclude Include="$(MonoSourceLocation)\support\minizip\iowin32.h" />
<ClInclude Include="$(MonoSourceLocation)\support\minizip\unzip.h" />
<ClInclude Include="$(MonoSourceLocation)\support\minizip\zip.h" />
<ClInclude Include="$(MonoSourceLocation)\support\mph.h" />
diff --git a/msvc/monoposixhelper.targets.filters b/msvc/monoposixhelper.targets.filters
index 9189d646ac2..edfffd370e7 100644
--- a/msvc/monoposixhelper.targets.filters
+++ b/msvc/monoposixhelper.targets.filters
@@ -78,9 +78,9 @@
<ClInclude Include="$(MonoSourceLocation)\support\deflate.h">
<Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter>
</ClInclude>
- <ClInclude Include="$(MonoSourceLocation)\support\gzguts.h">
- <Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter>
- </ClInclude>
+ <ClInclude Include="$(MonoSourceLocation)\support\gzguts.h">
+ <Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter>
+ </ClInclude>
<ClInclude Include="$(MonoSourceLocation)\support\inffast.h">
<Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter>
</ClInclude>
@@ -114,9 +114,6 @@
<ClInclude Include="$(MonoSourceLocation)\support\minizip\unzip.h">
<Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter>
</ClInclude>
- <ClInclude Include="$(MonoSourceLocation)\support\minizip\iowin32.h">
- <Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter>
- </ClInclude>
<ClInclude Include="$(MonoSourceLocation)\support\minizip\zip.h">
<Filter>Header Files$(MonoPosixHelperFilterSubFolder)</Filter>
</ClInclude>
diff --git a/support/README.zlib b/support/README.zlib
index 4e97da192a4..bb24ea51088 100644
--- a/support/README.zlib
+++ b/support/README.zlib
@@ -1,10 +1,10 @@
-
-Unmodified sources for zlib-1.2.5 have been included with Mono, this
-is used to support compression and uncompression in older Linux
-systems that might have shipped older versions of zlib and to reduce
-dependencies.
-
-They were imported in Oct 22 2010.
+
+Unmodified sources for zlib-1.2.5 have been included with Mono, this
+is used to support compression and uncompression in older Linux
+systems that might have shipped older versions of zlib and to reduce
+dependencies.
+
+They were imported in Oct 22 2010.
---------------------------------------------------------------------------------------------------
@@ -18,4 +18,4 @@ Sources of truth:
Possibly other mono commits.
Debian matches master
-Ubuntu 1804 has one commit from master and one extra function for compat.
+Ubuntu 1804 has one commit from devel and one extra function for compat.