summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2016-07-08 17:14:53 -0300
committercoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2016-07-08 17:14:53 -0300
commit1d498ed12f23107d8112ffe3ed9ae0307e278efe (patch)
tree086d4753a59d395a34fa98311578f0921d16dd80
parent5ba3aaf1b515bda952f51d4d4db469cb055f2680 (diff)
update COPYING
-rw-r--r--COPYING18
1 files 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")
------------------------------------------------------------------------------------------------------------------------------------------