[SCM] WorldForge 3D client branch, master, updated. upstream/0.6.2-42-g2b485ba

[Stephen M. Webb]

The following commit has been merged in the master branch:
commit 2b485bad87bd6376a090bd9c82cbe63321f0e490
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Sun Apr 22 22:33:40 2012 -0400

    debian/copyright: added another stanza

diff --git a/debian/copyright b/debian/copyright
index f821572..75ff2a6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -108,6 +108,22 @@ 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: 
+ Permission is granted to use, copy, distribute and prepare derivative works of
+ this software for any purpose and without fee, provided, that the above
+ copyright notice and this statement appear in all copies.  Intel makes no
+ representations about the suitability of this software for any purpose.  This
+ software is provided "AS IS."
+ .
+ Intel specifically disclaims all warranties, express or implied, and all
+ liability, including consequential and other indirect damages, for the use of
+ this software, including liability for infringement of any proprietary rights,
+ and including the warranties of merchantability and fitness for a particular
+ 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/lua/luaobject.*
 Copyright: 2008 by Nigel Atkinson <suprapilot+LuaCode at gmail.com>
 License: LGPL-3+

-- 
WorldForge 3D client