summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLawnCable <lawncable.tmw2@simonlaux.de>2018-05-22 18:22:24 -0400
committerLawnCable <lawncable.tmw2@simonlaux.de>2018-05-22 18:22:24 -0400
commit1418170b080479c800c93b962be94db472dd98cc (patch)
treebe4543dc86c90f56326555c8c4453df31b1b80e0
parent2e97e2f4265ab946be252c1a1090b168d114db7f (diff)
parent2b444782180d276ce8347b1a4516581b127ef3b9 (diff)
downloadelectron-1418170b080479c800c93b962be94db472dd98cc.tar.gz
electron-1418170b080479c800c93b962be94db472dd98cc.tar.bz2
electron-1418170b080479c800c93b962be94db472dd98cc.tar.xz
electron-1418170b080479c800c93b962be94db472dd98cc.zip
Merge branch 'master' of https://gitlab.com/TMW2/lawncable
-rw-r--r--LICENSE2
-rw-r--r--assets/media/server/evol/LICENSE_NOTICE2
2 files changed, 3 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index 0b0750b..12fcb6c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -8,6 +8,8 @@ All assets that are from different projects have a license notice file next to i
The Fonts that we use have their own licenses:
- SourceSansPro-Regular (SIL Open Font License, Version 1.1) a full copy of that license is in the same folder as the font file itself.
+The files in the assets/lib/ directory are licensed under thir licenses that you can find in them or in a license file next to them.
+
________________________________________________________________________________
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
diff --git a/assets/media/server/evol/LICENSE_NOTICE b/assets/media/server/evol/LICENSE_NOTICE
index 8dd4e26..56dd644 100644
--- a/assets/media/server/evol/LICENSE_NOTICE
+++ b/assets/media/server/evol/LICENSE_NOTICE
@@ -1,3 +1,3 @@
-For further usage see the evol online git repositories.
+For further usage see the evol online git repositories and their website: to http://evolonline.org
background1.png (Kansu) (CC BY-SA 3.0) (Irukard)
icon.png is a part from the logo on the website which belongs to Evol Online.