CI: Add missing make install

[lugaru.git] / CONTENT-LICENSE.txt

diff --git a/CONTENT-LICENSE.txt b/CONTENT-LICENSE.txt
index 78da57dd5fbc182e01c3cac12a17858c3c2302e6..58b6b6626975d15ffa498da6e1c2c0f9b0bd4374 100644 (file)
--- a/CONTENT-LICENSE.txt
+++ b/CONTENT-LICENSE.txt
@@ -1,4 +1,7 @@
-The following game assets are under CC-BY-SA 3.0 Unported ( http://creativecommons.org/licenses/by-sa/3.0/ ) :
+## Wolfire assets (CC-BY-SA 3.0 Unported)
+
+The following game assets are under CC-BY-SA 3.0 Unported (http://creativecommons.org/licenses/by-sa/3.0/),
+with attribution to Wolfire Games (http://www.wolfire.com).
 
 Data/Animations/Wolfstop
 Data/Animations/Wolfslap
@@ -131,9 +134,26 @@ Data/Maps/map3
 Data/Maps/map2
 Data/Maps/map1
 
-Attribution to Wolfire : http://www.wolfire.com
+## Slib assets (CC-BY-SA)
+
+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:
+
+Data/Campaign/temple.txt
+
+Data/Maps/sven*
+
+Data/Textures/Desertcl.png
+Data/Textures/GiTop.png
+Data/Textures/GiTeared.png
+Data/Textures/GiBottom.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 
+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