Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/dbeef/spelunky-ds
Browse files Browse the repository at this point in the history
  • Loading branch information
dbeef committed Oct 7, 2018
2 parents 95fa602 + be2ee1e commit 1d404ed
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<ul>
<li> C++ </li>
<li> GNU Make </li>
<li> libnds - as included with devkitPro toolchain https://devkitpro.org/ </li>
<li> libnds - as included with devkitPro's toolchain https://devkitpro.org/ </li>
<li> mappy - https://tilemap.co.uk/mappy.php </li>
<li> desmume emulator </li>
<li> R4 card for testing on a real Nintendo </li>
Expand All @@ -90,7 +90,9 @@
<p> Full license text can be accessed under this link: </p>
https://github.com/dbeef/spelunky-ds/blob/master/LICENSE
<p>
Briefly, as for my code, I distribute it under GNU General Public License, as for Spelunky game assets, I use them under Spelunky® User License v1.1b, also, libnds and tools for building .nds files are provided by devkitPro which is under GNU General Public License (GPL).
Briefly, as for my code, I distribute it under GNU General Public License, as for Spelunky game assets, I use them under Spelunky® User License v1.1b, also, libnds and tools for building .nds files are provided by devkitARM;
devkitARM is constructed from and contains components licensed under GPL, BSD, zlib, LGPL & MPL licenses.
libnds is zlib licensed.

NintendoDS is a trademark of Nintendo and is used purely for descriptive purposes. This game is not affiliated with Nintendo.
</p>
Expand Down

0 comments on commit 1d404ed

Please sign in to comment.