configuration cleanup and bugfixes

[chaz/yoink] / COPYING

diff --git a/COPYING b/COPYING
index 53b5fd06960862362941089539c396821f11923c..afe3fe7adf778901b8dd6efc585c198f35f49a19 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -5,7 +5,7 @@ according to the following terms and conditions:
 
 The Simplified BSD License
 
-Copyright (c) 2009, Charles McGarvey 
+Copyright (c) 2009-2010, Charles McGarvey 
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -40,11 +40,6 @@ portions.  Neither do the terms and conditions associated with the
 following portions necessarily apply to the files released under the above
 license.  The texts of applicable licences can be found in doc/licenses/.
 
-  Portion: beatthecube.xm, nightfusion.xm
-   Source: http://8bitcollective.com/members/FearofDark/
-Copyright: (c) 2009 Stephen H. Johnston
-  License: CCPL-Attribution-ShareAlike-NonCommercial-2.5
-
   Portion: cml
    Source: http://www.cmldev.net/
 Copyright: (c) 2009 Jesse Anders
@@ -60,7 +55,7 @@ Copyright: (c) 2000-2004 Unicode, Inc.
 Copyright: (c) 2002 Bob Pendleton
   License: LGPL-2.1
 
-  Portion: libpng12-0.dll
+  Portion: libpng14.dll
    Source: http://www.libpng.org/pub/png/libpng.html
 Copyright: (c) 2004, 2006-2009 Glenn Randers-Pehrson
   License: libpng
@@ -75,6 +70,11 @@ Copyright: (c) 2009 Xiph.Org Foundation
 Copyright: (c) 1995-2008 Lua.org, PUC-Rio
   License: MIT
 
+  Portion: nightfusion.xm
+   Source: http://8bitcollective.com/members/FearofDark/
+Copyright: (c) 2009 Stephen H. Johnston
+  License: CCPL-Attribution-ShareAlike-NonCommercial-2.5
+
   Portion: OpenAL32.dll
    Source: http://kcat.strangesoft.net/openal.html
 Copyright: (c) 2009 Chris Robinson
@@ -85,7 +85,7 @@ Copyright: (c) 2009 Chris Robinson
 Copyright: (c) 2003 Neil Carter
   License: zlib-libpng
 
-  Portion: SDL.dll, SDL_image.dll
+  Portion: SDL.dll
    Source: http://www.libsdl.org/
 Copyright: (c) 2009 Sam Lantinga et al.
   License: LGPL-2.1