From 1d498ed12f23107d8112ffe3ed9ae0307e278efe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Fri, 8 Jul 2016 17:14:53 -0300 Subject: update COPYING --- COPYING | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/COPYING b/COPYING index e0d1aa5..d24d66a 100644 --- a/COPYING +++ b/COPYING @@ -38,7 +38,7 @@ b) The Creative Commons Attribution-ShareAlike 4.0 International License as publ ------------------------------------------------------------------------------------------------------------------------------------------ -The mutimedia files (in 'src/fnt+fdl'); +The mutimedia files (in 'src/doc+gpl', 'src/fnt+gpl', 'src/img+gpl', 'src/snd+gpl' and 'src/vid+gpl'); you can redistribute it and/or modify it under the terms of either: a) The Free Art License as published by Copyleft Attitude; @@ -49,14 +49,13 @@ b) The Creative Commons Attribution-ShareAlike 4.0 International License as publ either version 4.0, or (at your option) any later version (read "COPYING_CCBYSA_V4_0" or "http://creativecommons.org/licenses/by-sa/4.0/"), or -c) The GNU Free Documentation License as published by the Free Software Foundation; - either version 1.3, or (at your option) any later version; - with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts; - (read "COPYING_FDL_V1_3" or "http://gnu.org/licenses/fdl-1.3.html") +c) The GNU General Public License as published by the Free Software Foundation; + either version 2, or (at your option) any later version + (read "COPYING_GPL_V2_0" or "http://gnu.org/licenses/gpl-2.0.html") ------------------------------------------------------------------------------------------------------------------------------------------ -The mutimedia files (in 'src/doc+gpl', 'src/fnt+gpl', 'src/img+gpl', 'src/snd+gpl' and 'src/vid+gpl'); +The mutimedia files (in 'src/fnt+fdl'); you can redistribute it and/or modify it under the terms of either: a) The Free Art License as published by Copyleft Attitude; @@ -67,9 +66,10 @@ b) The Creative Commons Attribution-ShareAlike 4.0 International License as publ either version 4.0, or (at your option) any later version (read "COPYING_CCBYSA_V4_0" or "http://creativecommons.org/licenses/by-sa/4.0/"), or -c) The GNU General Public License as published by the Free Software Foundation; - either version 2, or (at your option) any later version - (read "COPYING_GPL_V2_0" or "http://gnu.org/licenses/gpl-2.0.html") +c) The GNU Free Documentation License as published by the Free Software Foundation; + either version 1.3, or (at your option) any later version; + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts; + (read "COPYING_FDL_V1_3" or "http://gnu.org/licenses/fdl-1.3.html") ------------------------------------------------------------------------------------------------------------------------------------------ -- cgit v1.2.3