Updated Lua 5.0 license to the latest Lua 5 license text from lua.org.

Added CREDITS file. This could use more updation, but I've put in all the names I can think of for now.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@126 c06c8d41-db1a-0410-9941-cceddc491573

2 files changed, 49 insertions, 15 deletions

diff --git a/crawl-ref/CREDITS b/crawl-ref/CREDITS
new file mode 100644
index 0000000000..fe85b63b57
--- /dev/null
+++ b/crawl-ref/CREDITS
@@ -0,0 +1,20 @@
+The Dungeon Crawl Stone Soup team (Peter Berger, Nat Lanza, Haran Pilpel, Erik

+Piper, Darshan Shaligram) would like to thank:

+

+* Linley Henzell, the author of Dungeon Crawl, for writing this great game.

+

+* Brent Ross, Dungeon Crawl 4.0/4.1 maintainer. Stone Soup owes a lot to his

+  ideas and code in Crawl 4.1.

+

+* Other members of the 4.0 Crawl development team: Michal Valvoda, Guus Sliepen,

+  Brian Robinson, Mark Mackey, Gordon Lipford, Daniel Ligon, Jesse Jones, Josh

+  Fishman, Don Brodale.

+

+* Everyone else who has contributed to Crawl in the past.

+

+We'd also like to thank members of the Dungeon Crawl community who have

+contributed to Dungeon Crawl Stone Soup:

+

+- Matthew Cline

+- R. Kusnery

+- Johan Strandell

diff --git a/crawl-ref/docs/lualicense.txt b/crawl-ref/docs/lualicense.txt
index 9a4652c140..274f501d8c 100644
--- a/crawl-ref/docs/lualicense.txt
+++ b/crawl-ref/docs/lualicense.txt
@@ -1,20 +1,34 @@
-Lua 5.0 license

-Copyright © 1994-2005 Lua.org, PUC-Rio.

+Lua License

+-----------

 

-Permission is hereby granted, free of charge, to any person obtaining a copy of

-this software and associated documentation files (the "Software"), to deal in

-the Software without restriction, including without limitation the rights to

-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of

-the Software, and to permit persons to whom the Software is furnished to do so,

-subject to the following conditions:

+Lua is licensed under the terms of the MIT license reproduced below.

+This means that Lua is free software and can be used for both academic

+and commercial purposes at absolutely no cost.

 

-The above copyright notice and this permission notice shall be included in all

-copies or substantial portions of the Software.

+For details and rationale, see http://www.lua.org/license.html .

+

+===============================================================================

+

+Copyright (C) 1994-2006 Lua.org, PUC-Rio.

+

+Permission is hereby granted, free of charge, to any person obtaining a copy

+of this software and associated documentation files (the "Software"), to deal

+in the Software without restriction, including without limitation the rights

+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+copies of the Software, and to permit persons to whom the Software is

+furnished to do so, subject to the following conditions:

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

 

 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS

-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR

-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER

-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

+THE SOFTWARE.

+

+===============================================================================

 

+(end of COPYRIGHT)