[SCM] WorldForge 3D client (media) branch, master, updated. upstream/0.6.2.1-23-g8625f15

[Stephen M. Webb]

The following commit has been merged in the master branch:
commit 8625f1562680d4d467c4993a868f60fe848e33b3
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Sun Jun 10 07:48:42 2012 -0400

    debian/copyright: fixed license for Bloom2.material

diff --git a/debian/copyright b/debian/copyright
index 9e88aac..d06071b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,27 +9,10 @@ License: GPL-2+ or GFDL-NIV-1.1+
 Files: media/shared/common/resources/ogre/ogre_scripts/*
 Copyright: 2000-2009 Torus Knot Software Ltd
 License: Expat
- 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.
 
 Files: media/shared/common/resources/ogre/ogre_scripts/scripts/Bloom2.material
 Copyright: 2007-2008 Dark Sylinc
-License: GPL-2+ or GFDL-NIV-1.1+
+License: Expat
 
 Files: media/shared/common/resources/ogre/caelum/core/*.cg
 Copyright: 2008 Caelum team.
@@ -93,6 +76,25 @@ License: Bitstream
  THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
  FONT SOFTWARE.
 
+License: Expat
+ 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.
+
 License: GPL-2+
  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

-- 
WorldForge 3D client (media)