[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 cc2575173ac7aa7614f4079f0535a6256e2e4368
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Mon Jun 4 14:47:31 2012 -0400

    debian/copyright: tweaked some license terms

diff --git a/debian/copyright b/debian/copyright
index dd715c4..9e88aac 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -29,11 +29,11 @@ License: Expat
 
 Files: media/shared/common/resources/ogre/ogre_scripts/scripts/Bloom2.material
 Copyright: 2007-2008 Dark Sylinc
-License: GPL-2+
+License: GPL-2+ or GFDL-NIV-1.1+
 
 Files: media/shared/common/resources/ogre/caelum/core/*.cg
 Copyright: 2008 Caelum team.
-License: LGPL-3
+License: LGPL-3+
  Caelum is free software: you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License as published
  by the Free Software Foundation, either version 3 of the License, or
@@ -50,7 +50,9 @@ License: LGPL-3
  On Debian systems, the full text of the GNU Lesser General Public
  License version 3 can be found in the file `/usr/share/common-licenses/LGPL-3'.
 
-Files: media/shared/common/resources/ogre/scripts/programs/*.glsl
+Files: media/shared/common/resources/ogre/scripts/programs/LightingVp.glsl
+       media/shared/common/resources/ogre/scripts/programs/SplatFp.glsl
+       media/shared/common/resources/ogre/scripts/programs/LightingFp.glsl
 Copyright: 2009  Alexey Torkhov
 License: GPL-2+
 

-- 
WorldForge 3D client (media)