diff options
author | David Walter Seikel | 2013-01-13 18:54:10 +1000 |
---|---|---|
committer | David Walter Seikel | 2013-01-13 18:54:10 +1000 |
commit | 959831f4ef5a3e797f576c3de08cd65032c997ad (patch) | |
tree | e7351908be5995f0b325b2ebeaa02d5a34b82583 /libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/gregbook/LICENSE | |
parent | Add info about changes to Irrlicht. (diff) | |
download | SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.zip SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.gz SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.bz2 SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.xz |
Remove damned ancient DOS line endings from Irrlicht. Hopefully I did not go overboard.
Diffstat (limited to 'libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/gregbook/LICENSE')
-rw-r--r-- | libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/gregbook/LICENSE | 100 |
1 files changed, 50 insertions, 50 deletions
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/gregbook/LICENSE b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/gregbook/LICENSE index 40a0c8e..d956717 100644 --- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/gregbook/LICENSE +++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/gregbook/LICENSE | |||
@@ -1,50 +1,50 @@ | |||
1 | --------------------------------------------------------------------------- | 1 | --------------------------------------------------------------------------- |
2 | 2 | ||
3 | Copyright (c) 1998-2008 Greg Roelofs. All rights reserved. | 3 | Copyright (c) 1998-2008 Greg Roelofs. All rights reserved. |
4 | 4 | ||
5 | This software is provided "as is," without warranty of any kind, | 5 | This software is provided "as is," without warranty of any kind, |
6 | express or implied. In no event shall the author or contributors | 6 | express or implied. In no event shall the author or contributors |
7 | be held liable for any damages arising in any way from the use of | 7 | be held liable for any damages arising in any way from the use of |
8 | this software. | 8 | this software. |
9 | 9 | ||
10 | The contents of this file are DUAL-LICENSED. You may modify and/or | 10 | The contents of this file are DUAL-LICENSED. You may modify and/or |
11 | redistribute this software according to the terms of one of the | 11 | redistribute this software according to the terms of one of the |
12 | following two licenses (at your option): | 12 | following two licenses (at your option): |
13 | 13 | ||
14 | 14 | ||
15 | LICENSE 1 ("BSD-like with advertising clause"): | 15 | LICENSE 1 ("BSD-like with advertising clause"): |
16 | 16 | ||
17 | Permission is granted to anyone to use this software for any purpose, | 17 | Permission is granted to anyone to use this software for any purpose, |
18 | including commercial applications, and to alter it and redistribute | 18 | including commercial applications, and to alter it and redistribute |
19 | it freely, subject to the following restrictions: | 19 | it freely, subject to the following restrictions: |
20 | 20 | ||
21 | 1. Redistributions of source code must retain the above copyright | 21 | 1. Redistributions of source code must retain the above copyright |
22 | notice, disclaimer, and this list of conditions. | 22 | notice, disclaimer, and this list of conditions. |
23 | 2. Redistributions in binary form must reproduce the above copyright | 23 | 2. Redistributions in binary form must reproduce the above copyright |
24 | notice, disclaimer, and this list of conditions in the documenta- | 24 | notice, disclaimer, and this list of conditions in the documenta- |
25 | tion and/or other materials provided with the distribution. | 25 | tion and/or other materials provided with the distribution. |
26 | 3. All advertising materials mentioning features or use of this | 26 | 3. All advertising materials mentioning features or use of this |
27 | software must display the following acknowledgment: | 27 | software must display the following acknowledgment: |
28 | 28 | ||
29 | This product includes software developed by Greg Roelofs | 29 | This product includes software developed by Greg Roelofs |
30 | and contributors for the book, "PNG: The Definitive Guide," | 30 | and contributors for the book, "PNG: The Definitive Guide," |
31 | published by O'Reilly and Associates. | 31 | published by O'Reilly and Associates. |
32 | 32 | ||
33 | 33 | ||
34 | LICENSE 2 (GNU GPL v2 or later): | 34 | LICENSE 2 (GNU GPL v2 or later): |
35 | 35 | ||
36 | This program is free software; you can redistribute it and/or modify | 36 | This program is free software; you can redistribute it and/or modify |
37 | it under the terms of the GNU General Public License as published by | 37 | it under the terms of the GNU General Public License as published by |
38 | the Free Software Foundation; either version 2 of the License, or | 38 | the Free Software Foundation; either version 2 of the License, or |
39 | (at your option) any later version. | 39 | (at your option) any later version. |
40 | 40 | ||
41 | This program is distributed in the hope that it will be useful, | 41 | This program is distributed in the hope that it will be useful, |
42 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 42 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
43 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 43 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
44 | GNU General Public License for more details. | 44 | GNU General Public License for more details. |
45 | 45 | ||
46 | You should have received a copy of the GNU General Public License | 46 | You should have received a copy of the GNU General Public License |
47 | along with this program; if not, write to the Free Software Foundation, | 47 | along with this program; if not, write to the Free Software Foundation, |
48 | Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 48 | Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
49 | 49 | ||
50 | --------------------------------------------------------------------------- | 50 | --------------------------------------------------------------------------- |