diff --git a/ANNOUNCE b/ANNOUNCE index d7a7812e4..7d5efbe76 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.4.0beta65 - June 24, 2009 +Libpng 1.4.0beta65 - June 25, 2009 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -488,8 +488,8 @@ version 1.4.0beta64 [June 24, 2009] Moved the various unknown chunk macro definitions outside of the PNG_READ|WRITE_ANCILLARY_CHUNK_SUPPORTED blocks. -version 1.4.0beta65 [June 24, 2009] - Added a reference to the zlib-libpng license in each file. +version 1.4.0beta65 [June 25, 2009] + Added a reference to the zlib/libpng license in each file. version 1.4.0betaN [future] Build shared libraries with -lz and sometimes -lm. diff --git a/CHANGES b/CHANGES index 7ac0a74fe..0fb41ad59 100644 --- a/CHANGES +++ b/CHANGES @@ -2165,8 +2165,8 @@ version 1.4.0beta64 [June 24, 2009] Moved the various unknown chunk macro definitions outside of the PNG_READ|WRITE_ANCILLARY_CHUNK_SUPPORTED blocks. -version 1.4.0beta65 [June 24, 2009] - Added a reference to the zlib-libpng license in each file. +version 1.4.0beta65 [June 25, 2009] + Added a reference to the zlib/libpng license in each file. version 1.4.0betaN [future] Build shared libraries with -lz and sometimes -lm. diff --git a/INSTALL b/INSTALL index 4ed8fd70c..eeb75b05b 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.4.0beta65 - June 24, 2009 +Installing libpng version 1.4.0beta65 - June 25, 2009 On Unix/Linux and similar systems, you can simply type diff --git a/LICENSE b/LICENSE index ba2706445..bfdc2099c 100644 --- a/LICENSE +++ b/LICENSE @@ -8,9 +8,9 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: If you modify libpng you may insert additional notices immediately following this sentence. -This code is released under the zlib-libpng license. +This code is released under the zlib/libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.0beta65, June 24, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.4.0beta65, June 25, 2009, are Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 24, 2009 +June 25, 2009 diff --git a/README b/README index afb6597dc..7124bb5a6 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.4.0beta65 - June 24, 2009 (shared library 14.0) +README for libpng version 1.4.0beta65 - June 25, 2009 (shared library 14.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. diff --git a/contrib/pngminim/decoder/pngusr.h b/contrib/pngminim/decoder/pngusr.h index 86c688780..5535270d7 100644 --- a/contrib/pngminim/decoder/pngusr.h +++ b/contrib/pngminim/decoder/pngusr.h @@ -2,7 +2,7 @@ * * Copyright (c) 2007, 2009 Glenn Randers-Pehrson * - * This code is released under the zlib-libpng license. + * This code is released under the zlib/libpng license. * For conditions of distribution and use, see copyright notice, disclaimer, * and license in png.h * diff --git a/contrib/pngminim/encoder/pngusr.h b/contrib/pngminim/encoder/pngusr.h index 9c6310fe9..fd0b28dc3 100644 --- a/contrib/pngminim/encoder/pngusr.h +++ b/contrib/pngminim/encoder/pngusr.h @@ -2,7 +2,7 @@ * * Copyright (c) 2007, 2009 Glenn Randers-Pehrson * - * This code is released under the zlib-libpng license. + * This code is released under the zlib/libpng license. * For conditions of distribution and use, see copyright notice, disclaimer, * and license in png.h * diff --git a/contrib/pngminim/preader/pngusr.h b/contrib/pngminim/preader/pngusr.h index 6ea9d2c02..a280ba63e 100644 --- a/contrib/pngminim/preader/pngusr.h +++ b/contrib/pngminim/preader/pngusr.h @@ -2,7 +2,7 @@ * * Copyright (c) 2007, 2009 Glenn Randers-Pehrson * - * This code is released under the zlib-libpng license. + * This code is released under the zlib/libpng license. * For conditions of distribution and use, see copyright notice, disclaimer, * and license in png.h * diff --git a/contrib/visupng/PngFile.c b/contrib/visupng/PngFile.c index dbd5b184d..3ba2f032b 100644 --- a/contrib/visupng/PngFile.c +++ b/contrib/visupng/PngFile.c @@ -4,7 +4,7 @@ // Copyright 2000, Willem van Schaik. // -// This code is released under the zlib-libpng license. +// This code is released under the zlib/libpng license. // For conditions of distribution and use, see the // copyright/license/disclaimer notice in png.h diff --git a/contrib/visupng/PngFile.h b/contrib/visupng/PngFile.h index 8632125ca..f43e4ad43 100644 --- a/contrib/visupng/PngFile.h +++ b/contrib/visupng/PngFile.h @@ -4,7 +4,7 @@ // Copyright 2000, Willem van Schaik. // -// This code is released under the zlib-libpng license. +// This code is released under the zlib/libpng license. // For conditions of distribution and use, see the // copyright/license/disclaimer notice in png.h diff --git a/contrib/visupng/README.txt b/contrib/visupng/README.txt index 6b49cb287..009f1dbf0 100644 --- a/contrib/visupng/README.txt +++ b/contrib/visupng/README.txt @@ -3,7 +3,7 @@ Microsoft Developer Studio Build File, Format Version 6.00 for VisualPng Copyright 2000, Willem van Schaik. -This code is released under the zlib-libpng license. +This code is released under the zlib/libpng license. For conditions of distribution and use, see the copyright/license/disclaimer notice in png.h diff --git a/contrib/visupng/VisualPng.c b/contrib/visupng/VisualPng.c index 2fd0ea1f6..aa7f4dd63 100644 --- a/contrib/visupng/VisualPng.c +++ b/contrib/visupng/VisualPng.c @@ -4,7 +4,7 @@ // Copyright 2000, Willem van Schaik. // -// This code is released under the zlib-libpng license. +// This code is released under the zlib/libpng license. // For conditions of distribution and use, see the // copyright/license/disclaimer notice in png.h diff --git a/example.c b/example.c index 2571b145f..9e0a2337f 100644 --- a/example.c +++ b/example.c @@ -2,7 +2,7 @@ #if 0 /* in case someone actually tries to compile this */ /* example.c - an example of using libpng - * Last changed in libpng 1.4.0 [June 24, 2009] + * Last changed in libpng 1.4.0 [June 25, 2009] * This file has been placed in the public domain by the authors. * Maintained 1998-2009 Glenn Randers-Pehrson * Maintained 1996, 1997 Andreas Dilger) diff --git a/libpng-1.4.0beta65.txt b/libpng-1.4.0beta65.txt index ef113b725..70740e8ba 100644 --- a/libpng-1.4.0beta65.txt +++ b/libpng-1.4.0beta65.txt @@ -1,17 +1,17 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.0beta65 - June 24, 2009 + libpng version 1.4.0beta65 - June 25, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson - This document is released under the zlib-libpng license. + This document is released under the zlib/libpng license. For conditions of distribution and use, see copyright notice, disclaimer, and license in png.h Based on: - libpng versions 0.97, January 1998, through 1.4.0beta65 - June 24, 2009 + libpng versions 0.97, January 1998, through 1.4.0beta65 - June 25, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -3147,7 +3147,7 @@ source. XIII. Y2K Compliance in libpng -June 24, 2009 +June 25, 2009 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. diff --git a/libpng.3 b/libpng.3 index 7f835186d..a3a89798a 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "June 24, 2009" +.TH LIBPNG 3 "June 25, 2009" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta65 .SH SYNOPSIS @@ -809,18 +809,18 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.4.0beta65 - June 24, 2009 + libpng version 1.4.0beta65 - June 25, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson - This document is released under the zlib-libpng license. + This document is released under the zlib/libpng license. For conditions of distribution and use, see copyright notice, disclaimer, and license in png.h Based on: - libpng versions 0.97, January 1998, through 1.4.0beta65 - June 24, 2009 + libpng versions 0.97, January 1998, through 1.4.0beta65 - June 25, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -3956,7 +3956,7 @@ source. .SH XIII. Y2K Compliance in libpng -June 24, 2009 +June 25, 2009 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -4186,7 +4186,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.0beta65 - June 24, 2009: +Libpng version 1.4.0beta65 - June 25, 2009: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4207,9 +4207,9 @@ included in the libpng distribution, the latter shall prevail.) If you modify libpng you may insert additional notices immediately following this sentence. -This code is released under the zlib-libpng license. +This code is released under the zlib/libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.0beta65, June 24, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.4.0beta65, June 25, 2009, are Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -4308,7 +4308,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 24, 2009 +June 25, 2009 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 7c101885e..9217678fa 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "June 24, 2009" +.TH LIBPNGPF 3 "June 25, 2009" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta65 (private functions) diff --git a/png.5 b/png.5 index c454272bf..480219c54 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "June 24, 2009" +.TH PNG 5 "June 25, 2009" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.h b/png.h index 2371192e1..bf96afac7 100644 --- a/png.h +++ b/png.h @@ -1,17 +1,17 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.0beta65 - June 24, 2009 + * libpng version 1.4.0beta65 - June 25, 2009 * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * This code is released under the zlib-libpng license (See LICENSE, below) + * This code is released under the zlib/libpng license (See LICENSE, below) * * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.4.0beta65 - June 24, 2009: Glenn + * libpng versions 0.97, January 1998, through 1.4.0beta65 - June 25, 2009: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -159,7 +159,7 @@ * If you modify libpng you may insert additional notices immediately following * this sentence. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta65, June 24, 2009, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta65, June 25, 2009, are * Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: @@ -335,7 +335,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.4.0beta65" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.0beta65 - June 24, 2009\n" + " libpng version 1.4.0beta65 - June 25, 2009\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 diff --git a/pngconf.h b/pngconf.h index 90f4ec3ff..9d04fba4e 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,13 +1,13 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.0beta65 - June 24, 2009 + * libpng version 1.4.0beta65 - June 25, 2009 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * This code is released under the zlib-libpng license. + * This code is released under the zlib/libpng license. * For conditions of distribution and use, see copyright notice, disclaimer, * and license in png.h * diff --git a/pngerror.c b/pngerror.c index 8fa0c3263..021611f25 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,12 +1,12 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * Last changed in libpng 1.4.0 [June 24, 2009] + * Last changed in libpng 1.4.0 [June 25, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * This code is released under the zlib-libpng license. + * This code is released under the zlib/libpng license. * For conditions of distribution and use, see copyright notice, disclaimer, * and license in png.h * diff --git a/pngget.c b/pngget.c index 7ebf75403..7e894c873 100644 --- a/pngget.c +++ b/pngget.c @@ -1,12 +1,12 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.4.0 [June 24, 2009] + * Last changed in libpng 1.4.0 [June 25, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * This code is released under the zlib-libpng license. + * This code is released under the zlib/libpng license. * For conditions of distribution and use, see copyright notice, disclaimer, * and license in png.h * diff --git a/pngmem.c b/pngmem.c index 14927f795..e39d89235 100644 --- a/pngmem.c +++ b/pngmem.c @@ -1,12 +1,12 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.4.0 [June 24, 2009] + * Last changed in libpng 1.4.0 [June 25, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * This code is released under the zlib-libpng license. + * This code is released under the zlib/libpng license. * For conditions of distribution and use, see copyright notice, disclaimer, * and license in png.h * diff --git a/pngpread.c b/pngpread.c index 69153edd8..641ab6af8 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,12 +1,12 @@ /* pngpread.c - read a png file in push mode * - * Last changed in libpng 1.4.0 [June 24, 2009] + * Last changed in libpng 1.4.0 [June 25, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * This code is released under the zlib-libpng license. + * This code is released under the zlib/libpng license. * For conditions of distribution and use, see copyright notice, disclaimer, * and license in png.h */ diff --git a/pngpriv.h b/pngpriv.h index 4bce9c554..404fd5478 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,13 +1,13 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.0beta65 - June 24, 2009 + * libpng version 1.4.0beta65 - June 25, 2009 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * This code is released under the zlib-libpng license. + * This code is released under the zlib/libpng license. * For conditions of distribution and use, see copyright notice, disclaimer, * and license in png.h */ diff --git a/pngread.c b/pngread.c index b550be69f..1b6959e15 100644 --- a/pngread.c +++ b/pngread.c @@ -1,12 +1,12 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.4.0 [June 24, 2009] + * Last changed in libpng 1.4.0 [June 25, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * This code is released under the zlib-libpng license. + * This code is released under the zlib/libpng license. * For conditions of distribution and use, see copyright notice, disclaimer, * and license in png.h * diff --git a/pngrio.c b/pngrio.c index f9fa69e4f..f5b85593e 100644 --- a/pngrio.c +++ b/pngrio.c @@ -1,12 +1,12 @@ /* pngrio.c - functions for data input * - * Last changed in libpng 1.4.0 [June 24, 2009] + * Last changed in libpng 1.4.0 [June 25, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * This code is released under the zlib-libpng license. + * This code is released under the zlib/libpng license. * For conditions of distribution and use, see copyright notice, disclaimer, * and license in png.h * diff --git a/pngrtran.c b/pngrtran.c index 52d8913ba..d8b12ca96 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,12 +1,12 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.4.0 [June 24, 2009] + * Last changed in libpng 1.4.0 [June 25, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * This code is released under the zlib-libpng license. + * This code is released under the zlib/libpng license. * For conditions of distribution and use, see copyright notice, disclaimer, * and license in png.h * diff --git a/pngrutil.c b/pngrutil.c index a26592ba7..7ef9d6029 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,12 +1,12 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.4.0 [June 24, 2009] + * Last changed in libpng 1.4.0 [June 25, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * This code is released under the zlib-libpng license. + * This code is released under the zlib/libpng license. * For conditions of distribution and use, see copyright notice, disclaimer, * and license in png.h * diff --git a/pngset.c b/pngset.c index 27e836835..50821f356 100644 --- a/pngset.c +++ b/pngset.c @@ -1,12 +1,12 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.4.0 [June 24, 2009] + * Last changed in libpng 1.4.0 [June 25, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * This code is released under the zlib-libpng license. + * This code is released under the zlib/libpng license. * For conditions of distribution and use, see copyright notice, disclaimer, * and license in png.h * diff --git a/pngtest.c b/pngtest.c index be1dfaa9a..f6dc00111 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1,12 +1,12 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.4.0 [June 24, 2009] + * Last changed in libpng 1.4.0 [June 25, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * This code is released under the zlib-libpng license. + * This code is released under the zlib/libpng license. * For conditions of distribution and use, see copyright notice, disclaimer, * and license in png.h * diff --git a/pngtrans.c b/pngtrans.c index 094d5b513..b7adb14ef 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -1,12 +1,12 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * Last changed in libpng 1.4.0 [June 24, 2009] + * Last changed in libpng 1.4.0 [June 25, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * This code is released under the zlib-libpng license. + * This code is released under the zlib/libpng license. * For conditions of distribution and use, see copyright notice, disclaimer, * and license in png.h */ diff --git a/pngwio.c b/pngwio.c index c3a099648..85eae6178 100644 --- a/pngwio.c +++ b/pngwio.c @@ -1,12 +1,12 @@ /* pngwio.c - functions for data output * - * Last changed in libpng 1.4.0 [June 24, 2009] + * Last changed in libpng 1.4.0 [June 25, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * This code is released under the zlib-libpng license. + * This code is released under the zlib/libpng license. * For conditions of distribution and use, see copyright notice, disclaimer, * and license in png.h * diff --git a/pngwrite.c b/pngwrite.c index 87b0f06e2..de9f164a7 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,12 +1,12 @@ /* pngwrite.c - general routines to write a PNG file * - * Last changed in libpng 1.4.0 [June 24, 2009] + * Last changed in libpng 1.4.0 [June 25, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * This code is released under the zlib-libpng license. + * This code is released under the zlib/libpng license. * For conditions of distribution and use, see copyright notice, disclaimer, * and license in png.h */ diff --git a/pngwtran.c b/pngwtran.c index a69ad5086..d80c5614a 100644 --- a/pngwtran.c +++ b/pngwtran.c @@ -1,12 +1,12 @@ /* pngwtran.c - transforms the data in a row for PNG writers * - * Last changed in libpng 1.4.0 [June 24, 2009] + * Last changed in libpng 1.4.0 [June 25, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * This code is released under the zlib-libpng license. + * This code is released under the zlib/libpng license. * For conditions of distribution and use, see copyright notice, disclaimer, * and license in png.h */ diff --git a/pngwutil.c b/pngwutil.c index 9e90933ce..2bfdf5858 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,12 +1,12 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.4.0 [June 24, 2009] + * Last changed in libpng 1.4.0 [June 25, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * This code is released under the zlib-libpng license. + * This code is released under the zlib/libpng license. * For conditions of distribution and use, see copyright notice, disclaimer, * and license in png.h */ diff --git a/projects/visualc6/README.txt b/projects/visualc6/README.txt index fd9628c40..0e3cb9044 100644 --- a/projects/visualc6/README.txt +++ b/projects/visualc6/README.txt @@ -3,7 +3,7 @@ Microsoft Developer Studio Project File, Format Version 6.00 for libpng. Copyright (C) 2000-2004 Simon-Pierre Cadieux. Copyright (C) 2004 Cosmin Truta. -This code is released under the zlib-libpng license. +This code is released under the zlib/libpng license. For conditions of distribution and use, see copyright notice in png.h diff --git a/projects/visualc71/README.txt b/projects/visualc71/README.txt index 87dc1ff52..c94e3782d 100644 --- a/projects/visualc71/README.txt +++ b/projects/visualc71/README.txt @@ -2,7 +2,7 @@ Microsoft Developer Studio Project File, Format Version 7.10 for libpng. Copyright (C) 2004 Simon-Pierre Cadieux. -This code is released under the zlib-libpng license. +This code is released under the zlib/libpng license. For conditions of distribution and use, see copyright notice in png.h Assumptions: diff --git a/projects/visualc71/README_zlib.txt b/projects/visualc71/README_zlib.txt index c6b0aa3f6..8e2c2b9cb 100644 --- a/projects/visualc71/README_zlib.txt +++ b/projects/visualc71/README_zlib.txt @@ -7,7 +7,7 @@ Microsoft Developer Studio Project File, Format Version 7.10 for zlib. Copyright (C) 2004 Simon-Pierre Cadieux. Copyright (C) 2004 Cosmin Truta. -This code is released under the zlib-libpng license. +This code is released under the zlib/libpng license. For conditions of distribution and use, see copyright notice in zlib.h. diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 41adf35d9..c0e92e8e8 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -3,7 +3,7 @@ project(PNG) # Copyright (C) 2007 Glenn Randers-Pehrson -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index dc6021178..e3d862a9c 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -5,7 +5,7 @@ # Copyright (C) 2002 Glenn Randers-Pehrson -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/libpng-config.in b/scripts/libpng-config.in index 557b9c863..dbeef82f8 100755 --- a/scripts/libpng-config.in +++ b/scripts/libpng-config.in @@ -5,7 +5,7 @@ # Copyright (C) 2002, 2004, 2006, 2007 Glenn Randers-Pehrson -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/libpng.icc b/scripts/libpng.icc index a9e932f19..ce8180eb4 100644 --- a/scripts/libpng.icc +++ b/scripts/libpng.icc @@ -2,7 +2,7 @@ // IBM VisualAge/C++ version 4.0 or later // Copyright (C) 2000 Cosmin Truta // -// This code is released under the zlib-libpng license. +// This code is released under the zlib/libpng license. // For conditions of distribution and use, see copyright notice, disclaimer, // and license in png.h // diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 8626f7b3e..7102a41a9 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -4,7 +4,7 @@ # Copyright (C) 1998 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 09a9c3ee3..3fb177970 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -4,7 +4,7 @@ # Copyright (C) 1998 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 8bb269673..874c4aec3 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -4,7 +4,7 @@ # Copyright (C) 2000 Marc O. Gloor (AIX support added, from makefile.gcc) # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.amiga b/scripts/makefile.amiga index e181b3d90..32d98a4b3 100644 --- a/scripts/makefile.amiga +++ b/scripts/makefile.amiga @@ -2,7 +2,7 @@ # makefile for libpng and SAS C V6.5x compiler # Copyright (C) 1995-2000 Wolf Faust # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h # diff --git a/scripts/makefile.atari b/scripts/makefile.atari index 1a6f6cb34..3b771b5dd 100644 --- a/scripts/makefile.atari +++ b/scripts/makefile.atari @@ -2,7 +2,7 @@ # Copyright (C) 2002 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h # diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 3408f6cbf..af2cbd268 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -4,7 +4,7 @@ # Copyright (C) 1999 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 9b3fbfa43..6e45decb5 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -8,7 +8,7 @@ # Copyright (C) 1998-2000 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 338d5815c..b258c0aa8 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -5,7 +5,7 @@ # Copyright (C) 1998, 1999 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 35aa08f35..b779687a6 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -2,7 +2,7 @@ # Copyright (C) 2000-2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.dj2 b/scripts/makefile.dj2 index 539d4de9d..e0c6157fe 100644 --- a/scripts/makefile.dj2 +++ b/scripts/makefile.dj2 @@ -2,7 +2,7 @@ # Copyright (C) 2002, 2006, 2009 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 54f0c4187..d02a00177 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -3,7 +3,7 @@ # and Glenn Randers-Pehrson # Copyright (C) 1996, 1997 Andreas Dilger # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.freebsd b/scripts/makefile.freebsd index 5c4fb00e3..6ba1dec13 100644 --- a/scripts/makefile.freebsd +++ b/scripts/makefile.freebsd @@ -1,7 +1,7 @@ # makefile for libpng under FreeBSD # Copyright (C) 2002, 2007, 2009 Glenn Randers-Pehrson and Andrey A. Chernov # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.gcc b/scripts/makefile.gcc index 16bdf96e0..7e05743a0 100644 --- a/scripts/makefile.gcc +++ b/scripts/makefile.gcc @@ -3,7 +3,7 @@ # Copyright (C) 2000 Cosmin Truta # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 038639bf6..2c96ff271 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -3,7 +3,7 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42 # contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 419e1c465..09eeeb3ad 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -4,7 +4,7 @@ # Copyright (C) 1998, 1999 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index b13df0b0b..df53d334d 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -3,7 +3,7 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42 # contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.ibmc b/scripts/makefile.ibmc index 30f7b7ce7..89bbac439 100644 --- a/scripts/makefile.ibmc +++ b/scripts/makefile.ibmc @@ -3,7 +3,7 @@ # Copyright (C) 2006 Glenn Randers-Pehrson # Copyright (C) 2000 Cosmin Truta # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h # diff --git a/scripts/makefile.intel b/scripts/makefile.intel index 960a6744b..61c843e96 100644 --- a/scripts/makefile.intel +++ b/scripts/makefile.intel @@ -5,7 +5,7 @@ # Copyright (C) 2000, Pawel Mrochen, based on makefile.msc which is # copyright 1995 Guy Eric Schalnat, Group 42, Inc. # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h # diff --git a/scripts/makefile.knr b/scripts/makefile.knr index 977811499..26dc2e91c 100644 --- a/scripts/makefile.knr +++ b/scripts/makefile.knr @@ -2,7 +2,7 @@ # Copyright (C) 2002, 2006, 2009 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h # diff --git a/scripts/makefile.linux b/scripts/makefile.linux index e26460900..6dbdc40bd 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -3,7 +3,7 @@ # Glenn Randers-Pehrson # Copyright (C) 1996, 1997 Andreas Dilger # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 06ca502cd..90d2255f1 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -8,7 +8,7 @@ # Copyright (C) 1998-2000, 2007 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.mips b/scripts/makefile.mips index dcd9f4206..036b6fa66 100644 --- a/scripts/makefile.mips +++ b/scripts/makefile.mips @@ -2,7 +2,7 @@ # Copyright (C) Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.msc b/scripts/makefile.msc index da1008a2b..1abb38cfc 100644 --- a/scripts/makefile.msc +++ b/scripts/makefile.msc @@ -2,7 +2,7 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # Copyright (C) 2006, 2009 Glenn Randers-Pehrson # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h # diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 4595f73f8..5738f1c09 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -4,7 +4,7 @@ # Copyright (C) 2002 Patrick R.L. Welche # Copyright (C) 2007, 2009 Glenn Randers-Pehrson # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index dacb78ff6..8c1277a36 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -4,7 +4,7 @@ # Copyright (C) 2002 Patrick R.L. Welche # Copyright (C) 2007, 2009 Glenn Randers-Pehrson # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.nommx b/scripts/makefile.nommx index 4d716d0cf..d0f788b5d 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -3,7 +3,7 @@ # Glenn Randers-Pehrson # Copyright (C) 1996, 1997 Andreas Dilger # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index ae00babc9..60901ffed 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -2,7 +2,7 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # Copyright (C) 2007-2008 Glenn Randers-Pehrson # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.os2 b/scripts/makefile.os2 index f716c3f43..a572011d6 100644 --- a/scripts/makefile.os2 +++ b/scripts/makefile.os2 @@ -1,6 +1,6 @@ # makefile for libpng on OS/2 with gcc # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 993e68bbd..62d93999c 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -5,7 +5,7 @@ # Copyright (C) 1998 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 5bb26cf3f..b90c46ec5 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -2,7 +2,7 @@ # Copyright (C) 2001-2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index d395e6532..5fc1a7f12 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -2,7 +2,7 @@ # Copyright (C) 2001-2002, 2006, 2007 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 0942a95cc..b1b13a374 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -5,7 +5,7 @@ # Copyright (C) 1998-2001 Greg Roelofs # Copyright (C) 1996-1997 Andreas Dilger # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 377cde136..eca9c6074 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -4,7 +4,7 @@ # Copyright (C) 1998 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.std b/scripts/makefile.std index fdb7ecf41..7d0995b86 100644 --- a/scripts/makefile.std +++ b/scripts/makefile.std @@ -2,7 +2,7 @@ # Copyright (C) 2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.sunos b/scripts/makefile.sunos index 2bdcb6456..f5cb58d8a 100644 --- a/scripts/makefile.sunos +++ b/scripts/makefile.sunos @@ -2,7 +2,7 @@ # Copyright (C) 2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/makefile.vcawin32 b/scripts/makefile.vcawin32 index 470be4753..8fe3d1437 100644 --- a/scripts/makefile.vcawin32 +++ b/scripts/makefile.vcawin32 @@ -2,7 +2,7 @@ # Copyright (C) 2006,2009 Glenn Randers-Pehrson # Copyright (C) 1998 Tim Wegner # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h # diff --git a/scripts/makefile.vcwin32 b/scripts/makefile.vcwin32 index e177343fe..71f1f1597 100644 --- a/scripts/makefile.vcwin32 +++ b/scripts/makefile.vcwin32 @@ -2,7 +2,7 @@ # Copyright (C) 1998 Tim Wegner # Copyright (C) 2006,2009 Glenn Randers-Pehrson # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h # diff --git a/scripts/makefile.watcom b/scripts/makefile.watcom index 89c0cd64d..b4542c950 100644 --- a/scripts/makefile.watcom +++ b/scripts/makefile.watcom @@ -4,7 +4,7 @@ # Copyright (C) 2000, Pawel Mrochen, based on makefile.msc which is # copyright 1995 Guy Eric Schalnat, Group 42, Inc. # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h diff --git a/scripts/smakefile.ppc b/scripts/smakefile.ppc index 494540efb..f89ec8758 100644 --- a/scripts/smakefile.ppc +++ b/scripts/smakefile.ppc @@ -2,7 +2,7 @@ # makefile for libpng and SAS C V6.58/7.00 PPC compiler # Copyright (C) 1998 by Andreas R. Kleinert # -# This code is released under the zlib-libpng license. +# This code is released under the zlib/libpng license. # For conditions of distribution and use, see copyright notice, disclaimer, # and license in png.h