diff options
| author | raysan5 <raysan5@gmail.com> | 2018-10-13 16:31:22 +0200 |
|---|---|---|
| committer | raysan5 <raysan5@gmail.com> | 2018-10-13 16:31:22 +0200 |
| commit | e371609a1204edf7a019e909e97b146db8517c3d (patch) | |
| tree | ac1f131adae5775e3aacb1d22845fde418174661 | |
| parent | 68d2b0c071f29f85fd14445fa490cab9abd80d18 (diff) | |
| parent | e9f3f6347f296c45f0fd4bdc5917d4a6c78a8810 (diff) | |
| download | raylib-e371609a1204edf7a019e909e97b146db8517c3d.tar.gz raylib-e371609a1204edf7a019e909e97b146db8517c3d.zip | |
Merge branch 'master' of https://github.com/raysan5/raylib
| -rw-r--r-- | LICENSE.md | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -7,7 +7,7 @@ source code raylib is licensed under an unmodified zlib/libpng license, which is an OSI-certified, BSD-like license that allows static linking with closed source software: -Copyright (c) 2013-2016 Ramon Santamaria (@raysan5) +Copyright (c) 2013-2019 Ramon Santamaria (@raysan5) This software is provided "as-is", without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. @@ -41,9 +41,9 @@ The following fonts [provided with raylib](https://github.com/raysan5/raylib/tre 2d art ------ -[scarfy spritesheet](https://github.com/raysan5/raylib/blob/master/examples/textures/resources/scarfy.png) and [fudesumi image](https://github.com/raysan5/raylib/blob/master/examples/textures/resources/fudesumi.png) have been created by [Eiden Marsal](https://www.artstation.com/artist/marshall_z) and licensed as [Creative Commons Attribution-NonCommercial 3.0](https://creativecommons.org/licenses/by-nc/3.0/legalcode) +[scarfy spritesheet](https://github.com/raysan5/raylib/blob/master/examples/textures/resources/scarfy.png) and [fudesumi image](https://github.com/raysan5/raylib/blob/master/examples/textures/resources/fudesumi.png) have been created by [Eiden Marsal](https://www.artstation.com/artist/marshall_z) and are licensed as [Creative Commons Attribution-NonCommercial 3.0](https://creativecommons.org/licenses/by-nc/3.0/legalcode) 3d models --------- -[medieval city 3d models and textures](https://github.com/raysan5/raylib/tree/master/examples/models/resources/medieval) have been created by Alberto Cano and licensed as [Creative Commons Attribution-NonCommercial 4.0](https://creativecommons.org/licenses/by-nc/4.0/legalcode) +[medieval city 3d models and textures](https://github.com/raysan5/raylib/tree/master/examples/models/resources/medieval) have been created by Alberto Cano and are licensed as [Creative Commons Attribution-NonCommercial 4.0](https://creativecommons.org/licenses/by-nc/4.0/legalcode) |