The following commit has been merged in the master branch:
commit 7a1673a8ec79e9538236785b866fd83f28808330
Author: Stephen M. Webb <[email protected]>
Date: Mon Jun 11 12:39:55 2012 -0400
debian/copyright: corrected licensing of EmberPagingSceneManager
diff --git a/debian/copyright b/debian/copyright
index 6fbb857..3127194 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -98,15 +98,16 @@ Copyright: 2003-2006 Jose A. Milan and Tuan Kuranes
2000-2006 The OGRE Team
License: LGPL-2.1+
-Files: src/components/ogre/environment/caelum/*
-Copyright: 2006-2008 Caelum team
-License: LGPL-3+
+Files:
src/components/ogre/SceneManagers/EmberPagingSceneManager/*/EmberPaging*.*
+Copyright: 2005-2011 Erik Hjortsberg <[email protected]>
+License: GPL-2+
+
+Files:
src/components/ogre/SceneManagers/EmberPagingSceneManager/src/OgrePagingLandScapeAABSQ.cpp
+
src/components/ogre/SceneManagers/EmberPagingSceneManager/src/OgrePagingLandScapeMeshDecal.cpp
+Copyright: 2000-2006 The OGRE Team
+ 2006 Steven Klug
+License: LGPL-2.1+
-Files: src/components/ogre/gui/RenderedColourStringTextComponent.cpp
-Copyright: 2011 Erik Ogenvik
- 2004-2009 Paul D Turner & The CEGUI Development Team
-License: GPL-2+ and expat
-
Files:
src/components/ogre/SceneManagers/EmberPagingSceneManager/*/DRGNURBSSurface.*
Copyright: 1999 Intel Corporation
License:
@@ -123,6 +124,15 @@ License:
purpose. Intel does not assume any responsibility for any errors which may
appear in this software nor any responsibility to update it.
+Files: src/components/ogre/environment/caelum/*
+Copyright: 2006-2008 Caelum team
+License: LGPL-3+
+
+Files: src/components/ogre/gui/RenderedColourStringTextComponent.cpp
+Copyright: 2011 Erik Ogenvik
+ 2004-2009 Paul D Turner & The CEGUI Development Team
+License: GPL-2+ and expat
+
Files: src/components/lua/luaobject.*
Copyright: 2008 by Nigel Atkinson <[email protected]>
License: LGPL-3+
--
WorldForge 3D client
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
