Readd -pedantic to CXX flags for all builds

[lugaru.git] / CONTENT-LICENSE.txt

diff --git a/CONTENT-LICENSE.txt b/CONTENT-LICENSE.txt
index 38fda1b3e405ab11b95ef54a63edfbdf52f508d3..fe83827dac0e6846b4a55ea54d97d3b47cbb339b 100644 (file)
--- a/CONTENT-LICENSE.txt
+++ b/CONTENT-LICENSE.txt
@@ -10,27 +10,19 @@ Attribution to Wolfire Games: http://www.wolfire.com
 Those assets are all the files in the `Data` folder, except from the
 ones listed below with different licenses or credits.
 
-## Slib assets (CC-BY-SA)
+## Slib assets (CC-BY-SA 3.0 Unported)
 
 http://forums.wolfire.com/viewtopic.php?f=7&t=1066&start=270#p109473
 
-These assets are from the Temple campaign by Slib under CC-BY-SA:
+These assets are from the Temple campaign by Slib under CC-BY-SA 3.0 Unported:
 
 Data/Campaign/temple.txt
 
 Data/Maps/sven*
 
-Data/Textures/Desertcl.png
+Data/Textures/DesertCl.png
 Data/Textures/GiTop.png
 Data/Textures/GiTeared.png
 Data/Textures/GiBottom.png
-Data/Textures/mask.png
+Data/Textures/Mask.png
 Data/Textures/temple/World.png
-
-## Wolfire nonfree but redistributable assets
-
-All other game assets and demo data (should all be in "Data" folder
-in the root of the source tree) are not under the same license.
-Wolfire has allowed the other data to be freely redistributed
-for non commercial purposes, but it is forbidden to use in any revenue
-generating works.