diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-08-30 10:37:44 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-08-30 10:37:44 (GMT) |
| commit | 209b8d0bde085c41388ae13dbea251ba4dc81749 (patch) | |
| tree | 0763c03141d49e12fc3d3a4df85665c6fcf1f85e | |
| parent | b27ac46c3d7e9fbdc89676c1c9afc2aca27adc5f (diff) | |
| parent | c4e37ac1df099f302398d005ad5f004c14b4a9ca (diff) | |
| download | tcl-209b8d0bde085c41388ae13dbea251ba4dc81749.zip tcl-209b8d0bde085c41388ae13dbea251ba4dc81749.tar.gz tcl-209b8d0bde085c41388ae13dbea251ba4dc81749.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | .fossil-settings/crlf-glob | 3 | ||||
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | compat/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs | 2 | ||||
| -rw-r--r-- | compat/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs | 2 | ||||
| -rw-r--r-- | compat/zlib/contrib/dotzlib/DotZLib/CodecBase.cs | 2 | ||||
| -rw-r--r-- | compat/zlib/contrib/dotzlib/DotZLib/Deflater.cs | 2 | ||||
| -rw-r--r-- | compat/zlib/contrib/dotzlib/DotZLib/DotZLib.cs | 2 | ||||
| -rw-r--r-- | compat/zlib/contrib/dotzlib/DotZLib/GZipStream.cs | 2 | ||||
| -rw-r--r-- | compat/zlib/contrib/dotzlib/DotZLib/Inflater.cs | 2 |
9 files changed, 10 insertions, 8 deletions
diff --git a/.fossil-settings/crlf-glob b/.fossil-settings/crlf-glob index d98b4d6..6aa950b 100644 --- a/.fossil-settings/crlf-glob +++ b/.fossil-settings/crlf-glob @@ -1,4 +1,5 @@ -compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs +compat/zlib/contrib/dotzlib/readme.txt +compat/zlib/contrib/dotzlib/*.cs compat/zlib/contrib/vstudio/readme.txt compat/zlib/contrib/vstudio/*/zlib.rc compat/zlib/contrib/vstudio/*/zlibvc.def diff --git a/.gitattributes b/.gitattributes index 8a49592..a93c45e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -22,6 +22,7 @@ # Declare files that will always have CRLF line endings on checkout. *.bat eol=crlf +*.cs eol=crlf *.sln eol=crlf *.vc eol=crlf diff --git a/compat/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs b/compat/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs index c1230bf..4b2eee2 100644 --- a/compat/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs +++ b/compat/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs @@ -1,5 +1,5 @@ //
-// © Copyright Henrik Ravn 2004
+// © Copyright Henrik Ravn 2004
//
// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/compat/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs b/compat/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs index c1cab3a..3967e48 100644 --- a/compat/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs +++ b/compat/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs @@ -1,5 +1,5 @@ //
-// © Copyright Henrik Ravn 2004
+// © Copyright Henrik Ravn 2004
//
// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/compat/zlib/contrib/dotzlib/DotZLib/CodecBase.cs b/compat/zlib/contrib/dotzlib/DotZLib/CodecBase.cs index c4bc8b8..1c77cca 100644 --- a/compat/zlib/contrib/dotzlib/DotZLib/CodecBase.cs +++ b/compat/zlib/contrib/dotzlib/DotZLib/CodecBase.cs @@ -1,5 +1,5 @@ //
-// © Copyright Henrik Ravn 2004
+// © Copyright Henrik Ravn 2004
//
// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/compat/zlib/contrib/dotzlib/DotZLib/Deflater.cs b/compat/zlib/contrib/dotzlib/DotZLib/Deflater.cs index c247792..0f12498 100644 --- a/compat/zlib/contrib/dotzlib/DotZLib/Deflater.cs +++ b/compat/zlib/contrib/dotzlib/DotZLib/Deflater.cs @@ -1,5 +1,5 @@ //
-// © Copyright Henrik Ravn 2004
+// © Copyright Henrik Ravn 2004
//
// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/compat/zlib/contrib/dotzlib/DotZLib/DotZLib.cs b/compat/zlib/contrib/dotzlib/DotZLib/DotZLib.cs index be184b4..dcd9118 100644 --- a/compat/zlib/contrib/dotzlib/DotZLib/DotZLib.cs +++ b/compat/zlib/contrib/dotzlib/DotZLib/DotZLib.cs @@ -1,5 +1,5 @@ //
-// © Copyright Henrik Ravn 2004
+// © Copyright Henrik Ravn 2004
//
// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/compat/zlib/contrib/dotzlib/DotZLib/GZipStream.cs b/compat/zlib/contrib/dotzlib/DotZLib/GZipStream.cs index 58091d3..efacd4d 100644 --- a/compat/zlib/contrib/dotzlib/DotZLib/GZipStream.cs +++ b/compat/zlib/contrib/dotzlib/DotZLib/GZipStream.cs @@ -1,5 +1,5 @@ //
-// © Copyright Henrik Ravn 2004
+// © Copyright Henrik Ravn 2004
//
// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
diff --git a/compat/zlib/contrib/dotzlib/DotZLib/Inflater.cs b/compat/zlib/contrib/dotzlib/DotZLib/Inflater.cs index 8ed5451..e11b5b5 100644 --- a/compat/zlib/contrib/dotzlib/DotZLib/Inflater.cs +++ b/compat/zlib/contrib/dotzlib/DotZLib/Inflater.cs @@ -1,5 +1,5 @@ //
-// © Copyright Henrik Ravn 2004
+// © Copyright Henrik Ravn 2004
//
// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|