Merge pull request #23 from jamsilva/master

Cleanups, fixes (including one for "Retroarch/RetroPie Super Mario Allstars")

1 files changed, 165 insertions, 45 deletions

diff --git a/copyright b/copyright
index 9663005..223a4ae 100644
--- a/copyright
+++ b/copyright
@@ -1,3 +1,24 @@
+/*

+

+Copyright  (C) 2010-2017 The RetroArch team

+

+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.

+

+- - - Ported from - - -

+

 ndssfc

 Copyright (C) 2010 dking <dking024@gmail.com>,

   GBAtemp users BassAceGold, ShadauxCat and Nebuleon

@@ -21,69 +42,168 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 

 - - - Based on - - -

 

-Snes9x 1.43 (c) contributors; see a list in any source file under source/.

+Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.

+

+(c) Copyright 1996 - 2002  Gary Henderson (gary.henderson@ntlworld.com),

+                           Jerremy Koot (jkoot@snes9x.com)

+

+(c) Copyright 2002 - 2004  Matthew Kendora

+

+(c) Copyright 2002 - 2005  Peter Bortas (peter@bortas.org)

+

+(c) Copyright 2004 - 2005  Joel Yliluoma (http://iki.fi/bisqwit/)

+

+(c) Copyright 2001 - 2006  John Weidman (jweidman@slip.net)

+

+(c) Copyright 2002 - 2006  funkyass (funkyass@spam.shaw.ca),

+                           Kris Bleakley (codeviolation@hotmail.com)

+

+(c) Copyright 2002 - 2010  Brad Jorsch (anomie@users.sourceforge.net),

+                           Nach (n-a-c-h@users.sourceforge.net),

+                           zones (kasumitokoduck@yahoo.com)

+

+(c) Copyright 2006 - 2007  nitsuja

+

+(c) Copyright 2009 - 2010  BearOso,

+                           OV2

 

-Permission to use, copy, modify and distribute Snes9x in both binary and

-source form, for non-commercial purposes, is hereby granted without fee,

-providing that this license information and copyright notice appear with

-all copies and any derived work.

- 

-This software is provided 'as-is', without any express or implied

-warranty. In no event shall the authors be held liable for any damages

-arising from the use of this software.

- 

-Snes9x is freeware for PERSONAL USE only. Commercial users should

-seek permission of the copyright holders first. Commercial use includes

-charging money for Snes9x or software derived from Snes9x.

- 

-The copyright holders request that bug fixes and improvements to the code

-should be forwarded to them so everyone can benefit from the modifications

-in future versions.

 

-- - - Using icons - - -

+BS-X C emulator code

+(c) Copyright 2005 - 2006  Dreamer Nom,

+                           zones

 

-SNES controller icon from the Gaming Icons Pack by deviantART user deleket.

+C4 x86 assembler and some C emulation code

+(c) Copyright 2000 - 2003  _Demo_ (_demo_@zsnes.com),

+                           Nach,

+                           zsKnight (zsknight@zsnes.com)

 

-Some rights reserved. This work is licensed under a Creative Commons

-Attribution-Noncommercial-No Derivative Works 3.0 License.

+C4 C++ code

+(c) Copyright 2003 - 2006  Brad Jorsch,

+                           Nach

 

-See it here: http://deleket.deviantart.com/art/Gaming-Icons-Pack-42723812

+DSP-1 emulator code

+(c) Copyright 1998 - 2006  _Demo_,

+                           Andreas Naive (andreasnaive@gmail.com),

+                           Gary Henderson,

+                           Ivar (ivar@snes9x.com),

+                           John Weidman,

+                           Kris Bleakley,

+                           Matthew Kendora,

+                           Nach,

+                           neviksti (neviksti@hotmail.com)

 

-The full text of the license is found here:

-http://creativecommons.org/licenses/by-nc-nd/3.0/

+DSP-2 emulator code

+(c) Copyright 2003         John Weidman,

+                           Kris Bleakley,

+                           Lord Nightmare (lord_nightmare@users.sourceforge.net),

+                           Matthew Kendora,

+                           neviksti

 

-----

+DSP-3 emulator code

+(c) Copyright 2003 - 2006  John Weidman,

+                           Kris Bleakley,

+                           Lancer,

+                           z80 gaiden

 

-sbutto.svg, smaini.svg, smnsel.svg, smsel.svg, smsgfr.svg, snmaini.svg,

-  stitle.svg, subsela.svg:

+DSP-4 emulator code

+(c) Copyright 2004 - 2006  Dreamer Nom,

+                           John Weidman,

+                           Kris Bleakley,

+                           Nach,

+                           z80 gaiden

 

-Created by GBAtemp user Nebuleon.

+OBC1 emulator code

+(c) Copyright 2001 - 2004  zsKnight,

+                           pagefault (pagefault@zsnes.com),

+                           Kris Bleakley

+                           Ported from x86 assembler to C by sanmaiwashi

 

-Some rights reserved. This work is licensed under a Creative Commons

-Attribution-ShareAlike 3.0 license.

+SPC7110 and RTC C++ emulator code used in 1.39-1.51

+(c) Copyright 2002         Matthew Kendora with research by

+                           zsKnight,

+                           John Weidman,

+                           Dark Force

 

-The full text of the license is found here:

-http://creativecommons.org/licenses/by-sa/3.0/

+SPC7110 and RTC C++ emulator code used in 1.52+

+(c) Copyright 2009         byuu,

+                           neviksti

 

-----

+S-DD1 C emulator code

+(c) Copyright 2003         Brad Jorsch with research by

+                           Andreas Naive,

+                           John Weidman

 

-applications-system.svg, media-flash.svg, system-log-out.svg:

+S-RTC C emulator code

+(c) Copyright 2001 - 2006  byuu,

+                           John Weidman

 

-Created by artists for the Tango Icon Project.

+ST010 C++ emulator code

+(c) Copyright 2003         Feather,

+                           John Weidman,

+                           Kris Bleakley,

+                           Matthew Kendora

+

+Super FX x86 assembler emulator code

+(c) Copyright 1998 - 2003  _Demo_,

+                           pagefault,

+                           zsKnight

+

+Super FX C emulator code

+(c) Copyright 1997 - 1999  Ivar,

+                           Gary Henderson,

+                           John Weidman

+

+Sound emulator code used in 1.5-1.51

+(c) Copyright 1998 - 2003  Brad Martin

+(c) Copyright 1998 - 2006  Charles Bilyue'

+

+Sound emulator code used in 1.52+

+(c) Copyright 2004 - 2007  Shay Green (gblargg@gmail.com)

+

+(c) Copyright 2014 - 2016 Daniel De Matteis. (UNDER NO CIRCUMSTANCE

+WILL COMMERCIAL RIGHTS EVER BE APPROPRIATED TO ANY PARTY)

+

+Snes9x homepage: http://www.snes9x.com/

+

+Permission to use, copy, modify and/or distribute Snes9x in both binary

+and source form, for non-commercial purposes, is hereby granted without

+fee, providing that this license information and copyright notice appear

+with all copies and any derived work.

 

-This work is in the public domain.

+This software is provided 'as-is', without any express or implied

+warranty. In no event shall the authors be held liable for any damages

+arising from the use of this software or it's derivatives.

+

+Snes9x is freeware for PERSONAL USE only. Commercial users should

+seek permission of the copyright holders first. Commercial use includes,

+but is not limited to, charging money for Snes9x or software derived from

+Snes9x, including Snes9x or derivatives in commercial game bundles, and/or

+using Snes9x as a promotion for your commercial product.

+

+The copyright holders request that bug fixes and improvements to the code

+should be forwarded to them so everyone can benefit from the modifications

+in future versions.

 

-----

+Super NES and Super Nintendo Entertainment System are trademarks of

+Nintendo Co., Limited and its subsidiary companies.

 

-key.svg, manage.svg, slide-audio.svg:

+- - - Also includes code by - - -

 

-Part of the RRZE Icon Set, (c) 2010 Regional Computing Centre of Erlangen

-(RRZE).

+Copyright (C) 1997-2001 ZSNES Team ( zsknight@zsnes.com / _demo_@zsnes.com )

 

-Get it here: http://rrze-icon-set.berlios.de/download.html

+This program is free software; you can redistribute it and/or

+modify it under the terms of the GNU General Public License

+as published by the Free Software Foundation; either

+version 2 of the License, or (at your option) any later

+version.

 

-Some rights reserved. This work is licensed under a Creative Commons

-Attribution-ShareAlike 3.0 license.

+This program is distributed in the hope that it will be useful,

+but WITHOUT ANY WARRANTY; without even the implied warranty of

+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+GNU General Public License for more details.

+

+You should have received a copy of the GNU General Public License

+along with this program; if not, write to the Free Software

+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 

-The full text of the license is found here:

-http://creativecommons.org/licenses/by-sa/3.0/
\ No newline at end of file
+*/