Merge remote-tracking branch 'origin/released'

Conflicts:
	zlib/Makefile

1 files changed, 10 insertions, 10 deletions

diff --git a/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs b/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs
index 6fc0fdcc2..0491bfc2b 100644
--- a/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs
+++ b/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs
@@ -2,7 +2,7 @@ using System.Reflection;
 using System.Runtime.CompilerServices;

 

 //

-// General Information about an assembly is controlled through the following 

+// General Information about an assembly is controlled through the following

 // set of attributes. Change these attribute values to modify the information

 // associated with an assembly.

 //

@@ -13,42 +13,42 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyProduct("")]

 [assembly: AssemblyCopyright("(c) 2004 by Henrik Ravn")]

 [assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]		

+[assembly: AssemblyCulture("")]

 

 //

 // Version information for an assembly consists of the following four values:

 //

 //      Major Version

-//      Minor Version 

+//      Minor Version

 //      Build Number

 //      Revision

 //

-// You can specify all the values or you can default the Revision and Build Numbers 

+// You can specify all the values or you can default the Revision and Build Numbers

 // by using the '*' as shown below:

 

 [assembly: AssemblyVersion("1.0.*")]

 

 //

-// In order to sign your assembly you must specify a key to use. Refer to the 

+// In order to sign your assembly you must specify a key to use. Refer to the

 // Microsoft .NET Framework documentation for more information on assembly signing.

 //

-// Use the attributes below to control which key is used for signing. 

+// Use the attributes below to control which key is used for signing.

 //

-// Notes: 

+// Notes:

 //   (*) If no key is specified, the assembly is not signed.

 //   (*) KeyName refers to a key that has been installed in the Crypto Service

 //       Provider (CSP) on your machine. KeyFile refers to a file which contains

 //       a key.

-//   (*) If the KeyFile and the KeyName values are both specified, the 

+//   (*) If the KeyFile and the KeyName values are both specified, the

 //       following processing occurs:

 //       (1) If the KeyName can be found in the CSP, that key is used.

-//       (2) If the KeyName does not exist and the KeyFile does exist, the key 

+//       (2) If the KeyName does not exist and the KeyFile does exist, the key

 //           in the KeyFile is installed into the CSP and used.

 //   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.

 //       When specifying the KeyFile, the location of the KeyFile should be

 //       relative to the project output directory which is

 //       %Project Directory%\obj\<configuration>. For example, if your KeyFile is

-//       located in the project directory, you would specify the AssemblyKeyFile 

+//       located in the project directory, you would specify the AssemblyKeyFile

 //       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]

 //   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework

 //       documentation for more information on this.