diff --git a/ANNOUNCE b/ANNOUNCE index d7a7812e43ba2bd854b36bdd8203e1e6f12a9f5b..7d5efbe76e010fa38c75d46fb22be5bba151ad30 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 7ac0a74fef6f790e26267a643acb7e5d82cfc084..0fb41ad59a47fca960033b56e8a7289a11d555f7 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 4ed8fd70ce1164a4b8f0a067eca56230f9eb0b5c..eeb75b05b4244223ab0297216c05d85ae5004632 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 ba27064451a5da6e87e4d7b2697375650a1290b2..bfdc2099c8c0947932211e3af06d3b5fe9d85d5b 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 afb6597dcd8cf91a6dba6f4a14dc6258ba6a4639..7124bb5a64ab076ef87fb70cbc212aedc34b75f2 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 86c6887800406ceb50b850092108701057e46074..5535270d7a7dddaae5a279583244586ae816c092 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 9c6310fe9600bf786481a765542cb1ea541c4b70..fd0b28dc327e7d4b29e63901e887504b7cd216c6 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 6ea9d2c02e39dca07c3fe50b14d5a37dda391d73..a280ba63e7540cd77edcfb5acff87ed643145df7 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 dbd5b184df2e53af1d8c1fe69b40a7a01af016f9..3ba2f032b053a66e2af9a801aef8b51aa0481594 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 8632125ca48bac173e50267e1289dfca4c191e52..f43e4ad43d38b28a04a1da3c3bf7febb63b54718 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 6b49cb2877d5430ba221cddaeae4188cffcb9687..009f1dbf0b7ecdf67ab3d95c57098c7792aa390e 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 2fd0ea1f6721b6fddaa7b10386681af8c3968cc5..aa7f4dd63fd32757f3dfea20cdeccf4da2a99454 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 2571b145fed95e926e5f5c17ff081db73de8b0a0..9e0a2337f55a04b29df98875989318fd7ffcb45a 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 ef113b725b353c76881cc0e35120208f99cf61f2..70740e8bad0bb94bd0cf4a6c418d376d4712f8e1 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 7f835186d77575a057f514aceeaa73fefbe077b6..a3a89798a139fc6662c8d24b8b89821e2f520348 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 7c101885edeb445d719dc74c9aa73106c950c5e0..9217678faca81582134ad5aef12ee14f757b54bc 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 c454272bf4b1b680f3cb8440de3c2497ab7785e4..480219c5462ddf09e1686c90d2e8195d2387166c 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 2371192e17489583c7d7cdf26910e4967f44e79b..bf96afac7f8fd9ca9bfa8fc5147743cdd93c2ef3 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 90f4ec3ff017f04e15eb6674761ad03571b78263..9d04fba4eb5f5e8000d1378cc81975fc56037b68 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 8fa0c3263a722391b30e5f25abad09c7f640a350..021611f25c44fa342d1542cdc3dd31bdbf049caa 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 7ebf75403a6fcce4bfcd7d46288e56f79cb92757..7e894c8733bad4be24ba54f065975239c0a5f543 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 14927f795399b5c7fce167845d9a3aa06d699707..e39d8923582ffd0becdeaf001e667dbe2b629d01 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 69153edd84f59ccf637edfde79ddf36cd1dc3f40..641ab6af8f38a455a8374aec11ecedee5c21744a 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 4bce9c5541ad44f629947e719ba72501ef8b7741..404fd5478ff5fc61df568f6d0e442bc9c406f579 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 b550be69f30dd607b1166049f4100713b7188d32..1b6959e1527a92d1829efb47e1d6e665fcf3f71c 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 f9fa69e4f2f2f8747ce311118fe5637d34d1dfcf..f5b85593e66e732809ef735c58f39e88652c475a 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 52d8913ba0672521cd52e0a70d78a01ca4841c99..d8b12ca969f8175df79226790875b3cbcbbdff65 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 a26592ba7c979a1c24dd410b0acfb977d7eaad7f..7ef9d60292ee74c3b7735efdaecc0d486deae089 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 27e836835eed5de68ce95b809db3a816f76fd9f9..50821f3565678d0b681198f157457eacfd59de85 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 be1dfaa9a8a2dd21a1e4ce16c45181b5ad24d0ef..f6dc00111049f5c342c46e8490bc8c8dcc555226 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 094d5b5131794483974249007ddfa5dc7d3d04b8..b7adb14ef48391755a22e1cb802e1ac07096946d 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 c3a09964824358451bd73f157cc3886a3ac6c81e..85eae6178cbeb9512f182602950bd853a449d28a 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 87b0f06e27082d9be2528f20c3aeb3d39c46ab6e..de9f164a758e41d22c9969591573a3ea2dd36bc2 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 a69ad5086a93176b49c24a61a1ade9e2304c9bef..d80c5614add53a5f2147737b4732f1e37a340c63 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 9e90933cefe7631f89cb2fee63d919210e82b753..2bfdf585822b22b970762c86ff12e1a3c8874a01 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 fd9628c40287fb4d700d3eca737b727e01f2fe08..0e3cb90444910b4e8de84f4b7c23e1331b84db49 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 87dc1ff523b543d2319902dcb73311e49d931489..c94e3782d12f1d430daa6567441c019e1c056d44 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 c6b0aa3f6f5e44613f14ea624671a5664315dbef..8e2c2b9cb23467a919345c9b679083b0f75fb9c9 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 41adf35d91f21f77fc30efa40e18b6595c62447c..c0e92e8e895f136e35ac1bbc3c46c42f1ff923c9 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 dc60211784a6b09dab524fafb115543e85834f48..e3d862a9c8ee48d9405684f11b28090ffa234eff 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 557b9c863518c503700e4012c717439c179e3497..dbeef82f8301e0863000c788879566e16f1b5bc7 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 a9e932f1970724c43954640d545c6b3842730afd..ce8180eb4e93030f83e74eb554c3701adef897a2 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 8626f7b3ec91bf2521f81338971db765f4b8fa8b..7102a41a9ee1fdebd50580bf38544615f3e92307 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 09a9c3ee33cfe202ad50d0cd22cf4c8e40bb03af..3fb177970d8ba5ffa7fa39623c60686f34800d99 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 8bb269673766dd8609f23b683629f5c5eabd65b8..874c4aec3dd375b632e9fbe60519bf12b0dec484 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 e181b3d908e2f95ce882d92859d4d07a050d1857..32d98a4b33ae070cc38d00818e9a78bbd70630fc 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 1a6f6cb340ba793caed492e3c9072fd5dd4c3a0d..3b771b5dd717a5b2a6849565a58862f12a7308ca 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 3408f6cbfd5775fe2b1681fc6d1742bcd758fb19..af2cbd26898b89f16c73f0e878a8d1592f51007a 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 9b3fbfa4306b480f3b45edc87f7f0c916b6e653a..6e45decb5078b9226559317835289670d3af63a0 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 338d5815c9eae0a2bb3d70e95fb7b0fa9efa65f1..b258c0aa8db831d647e118a9339bb6a7e7066001 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 35aa08f35b79d18cc15183e9d709a71762b9e6c2..b779687a65d82b751a3c205b868c89110daf79e4 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 539d4de9d7b2245909373be53a7d43f7d4ae023a..e0c6157fe0b502f0c747a2f13d120ae6f869b560 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 54f0c4187614796b7fe5ee8b81abfe2a51bb2d4e..d02a00177742fa94c9cf3e3e45b76b69811c2ed4 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 5c4fb00e395888491b3a43bb4f14a49a7f5e09b8..6ba1dec13b3b52a4c61d61c40075c499d00be053 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 16bdf96e06eec563791ec5f6f6095f84977e5580..7e05743a04307ab2c806e2b4a938317ed4e9edf7 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 038639bf69ad2ae85467ae4f505c09e7aa18ae28..2c96ff271b993aaf86d24d95490d217d8fe89977 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 419e1c465d2e2e7cb20c7649228c65b0b95f162f..09eeeb3ad3d4b015a2bb134abf0268dee47a40c8 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 b13df0b0bf5cfdd251ad93376bddb680f4511ae7..df53d334dc9d39324159d9ae9391351dca4e3ad5 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 30f7b7ce73924dc1042359e5ea6a0c4f87ebd84c..89bbac43910d711f659dc6dfb161f7cb321d344f 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 960a6744bc5da3b2786f6adff1ce442cdec3aa5a..61c843e96112fd1a584410066ddb6a4e4fea3f59 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 977811499792e8e8ce4da1c5af60146eb4a7411b..26dc2e91c2891703bb222861555ceb41634aef6e 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 e2646090013ce4ca74f264f1a89a1f4e3d9d4210..6dbdc40bd5d129ffa56e756cd8ab3add3e219cdd 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 06ca502cde8a7edc9f4274175c5bd4c4ce6aeb12..90d2255f18a0a6b94aa7456e93945ef16c90ceba 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 dcd9f4206400c05dd38744cd5aedaf1459086496..036b6fa66e7cd8f70336665e75b5e2a95f4ad7dc 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 da1008a2bb18daa27452c3f96cd346ab5555b11a..1abb38cfcc693eabad4e06c6ecc97a88e8f4094c 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 4595f73f8a06b76f5e0bf6512054326aca2d72fd..5738f1c096cb7c89ff0f2dde6451a82e7a21987a 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 dacb78ff6e5d88780508aac0bc0437db13e6b496..8c1277a36084e817259ee72ed8acb90f5d350a38 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 4d716d0cf8a074c05912ad592a2bbb797f8d9438..d0f788b5d066da513b5963d4fbfa5736b49087c1 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 ae00babc9ba9f0dfd477c05dadcb31bbaa461bee..60901ffed8ce4cbf44f5c16f7c8f807f79b632ea 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 f716c3f43b406e5341d2283b26a010b370c1de98..a572011d68926ccdb00314c5badd18905f8568af 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 993e68bbd4aa2c2b561942a8327344f78d177378..62d93999cfb91417e68a22460e2126bf90b266e1 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 5bb26cf3f1ca91ef0a1c039bad3a300a15e36b48..b90c46ec54cc89d22a066c8500937795021a2ae2 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 d395e6532bfa92dfea99c3dfd851d74ea3e0ff66..5fc1a7f121bddae1d2c5055e2346474707703e70 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 0942a95cc9ea2c8026a469c6af0f64ad02b4c41f..b1b13a37430a96071ab202139aaaf229f4df5c5a 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 377cde13644c87a346ca0c7bda7dec0e0754f07c..eca9c60740a18e58c27363bfa5a7191cd8a2948c 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 fdb7ecf4119f1612220d84b7e70c4c0107994c1f..7d0995b865e799ce2b5ec69b3f2e3ad760f365d1 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 2bdcb64560256740bfdb456ad939813b9c91fcc5..f5cb58d8a2619e072a4f1f8e382ec3f0a724018f 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 470be47536829b075d193216de222b7373f6271a..8fe3d1437f0c2369e5a8d431d67d149bbacc34b4 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 e177343fee5e356c73c77bb2f8b09fb53acf5176..71f1f1597611dfab402d378f519ddb9a495d3bac 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 89c0cd64d6a9449f8d17c7660ad1945a82e9c5b4..b4542c950d0900ef4fd295870e084fc26b153fdf 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 494540efba6cfe7ec150e8ca8dd0f993c4849b3b..f89ec875842e058b76407259250adaef66e6e7a7 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