Skip to content

Commit

Permalink
- update license header. Update copyright year and unify naming: our …
Browse files Browse the repository at this point in the history 
…name is 'assimp', not 'ASSIMP'.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1147 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
  • Loading branch information
aramis_acg committed Feb 3, 2012
1 parent db3cee8 commit 4dbf539
Show file tree
Hide file tree
Showing 336 changed files with 1,334 additions and 1,336 deletions.
11 changes: 5 additions & 6 deletions LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
Open Asset Import Library (Assimp)
Open Asset Import Library (assimp)


Copyright (c) 2006-2010, Assimp Development Team
Copyright (c) 2006-2012, assimp team
All rights reserved.

Redistribution and use of this software in source and binary forms,
Expand All @@ -17,10 +16,10 @@ following conditions are met:
following disclaimer in the documentation and/or other
materials provided with the distribution.

* Neither the name of the ASSIMP team, nor the names of its
* Neither the name of the assimp team, nor the names of its
contributors may be used to endorse or promote products
derived from this software without specific prior
written permission of the ASSIMP Development Team.
written permission of the assimp team.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
Expand All @@ -36,7 +35,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.



AN EXCEPTION applies to all files in the ./test/models-nonbsd subfolder.
AN EXCEPTION applies to all files in the ./test/models-nonbsd folder.
These are 3d models for testing purposes, from various free sources
on the internet. They are - unless otherwise stated - copyright of
their respective creators, which may impose additional requirements
Expand Down
8 changes: 4 additions & 4 deletions code/3DSConverter.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
---------------------------------------------------------------------------
Open Asset Import Library (ASSIMP)
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
Copyright (c) 2006-2010, ASSIMP Development Team
Copyright (c) 2006-2012, assimp team
All rights reserved.
Expand All @@ -20,10 +20,10 @@ conditions are met:
following disclaimer in the documentation and/or other
materials provided with the distribution.
* Neither the name of the ASSIMP team, nor the names of its
* Neither the name of the assimp team, nor the names of its
contributors may be used to endorse or promote products
derived from this software without specific prior
written permission of the ASSIMP Development Team.
written permission of the assimp team.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
Expand Down
8 changes: 4 additions & 4 deletions code/3DSHelper.h
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
Open Asset Import Library (ASSIMP)
Open Asset Import Library (assimp)
----------------------------------------------------------------------
Copyright (c) 2006-2010, ASSIMP Development Team
Copyright (c) 2006-2012, assimp team
All rights reserved.
Redistribution and use of this software in source and binary forms,
Expand All @@ -18,10 +18,10 @@ following conditions are met:
following disclaimer in the documentation and/or other
materials provided with the distribution.
* Neither the name of the ASSIMP team, nor the names of its
* Neither the name of the assimp team, nor the names of its
contributors may be used to endorse or promote products
derived from this software without specific prior
written permission of the ASSIMP Development Team.
written permission of the assimp team.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
Expand Down
8 changes: 4 additions & 4 deletions code/3DSLoader.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
---------------------------------------------------------------------------
Open Asset Import Library (ASSIMP)
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
Copyright (c) 2006-2010, ASSIMP Development Team
Copyright (c) 2006-2012, assimp team
All rights reserved.
Expand All @@ -20,10 +20,10 @@ conditions are met:
following disclaimer in the documentation and/or other
materials provided with the distribution.
* Neither the name of the ASSIMP team, nor the names of its
* Neither the name of the assimp team, nor the names of its
contributors may be used to endorse or promote products
derived from this software without specific prior
written permission of the ASSIMP Development Team.
written permission of the assimp team.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
Expand Down
8 changes: 4 additions & 4 deletions code/3DSLoader.h
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

/*
Open Asset Import Library (ASSIMP)
Open Asset Import Library (assimp)
----------------------------------------------------------------------
Copyright (c) 2006-2010, ASSIMP Development Team
Copyright (c) 2006-2012, assimp team
All rights reserved.
Redistribution and use of this software in source and binary forms,
Expand All @@ -19,10 +19,10 @@ following conditions are met:
following disclaimer in the documentation and/or other
materials provided with the distribution.
* Neither the name of the ASSIMP team, nor the names of its
* Neither the name of the assimp team, nor the names of its
contributors may be used to endorse or promote products
derived from this software without specific prior
written permission of the ASSIMP Development Team.
written permission of the assimp team.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
Expand Down
8 changes: 4 additions & 4 deletions code/ACLoader.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

/*
---------------------------------------------------------------------------
Open Asset Import Library (ASSIMP)
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
Copyright (c) 2006-2010, ASSIMP Development Team
Copyright (c) 2006-2012, assimp team
All rights reserved.
Expand All @@ -21,10 +21,10 @@ conditions are met:
following disclaimer in the documentation and/or other
materials provided with the distribution.
* Neither the name of the ASSIMP team, nor the names of its
* Neither the name of the assimp team, nor the names of its
contributors may be used to endorse or promote products
derived from this software without specific prior
written permission of the ASSIMP Development Team.
written permission of the assimp team.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
Expand Down
8 changes: 4 additions & 4 deletions code/ACLoader.h
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
Open Asset Import Library (ASSIMP)
Open Asset Import Library (assimp)
----------------------------------------------------------------------
Copyright (c) 2006-2010, ASSIMP Development Team
Copyright (c) 2006-2012, assimp team
All rights reserved.
Redistribution and use of this software in source and binary forms,
Expand All @@ -18,10 +18,10 @@ following conditions are met:
following disclaimer in the documentation and/or other
materials provided with the distribution.
* Neither the name of the ASSIMP team, nor the names of its
* Neither the name of the assimp team, nor the names of its
contributors may be used to endorse or promote products
derived from this software without specific prior
written permission of the ASSIMP Development Team.
written permission of the assimp team.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
Expand Down
8 changes: 4 additions & 4 deletions code/ASELoader.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
---------------------------------------------------------------------------
Open Asset Import Library (ASSIMP)
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
Copyright (c) 2006-2010, ASSIMP Development Team
Copyright (c) 2006-2012, assimp team
All rights reserved.
Expand All @@ -20,10 +20,10 @@ conditions are met:
following disclaimer in the documentation and/or other
materials provided with the distribution.
* Neither the name of the ASSIMP team, nor the names of its
* Neither the name of the assimp team, nor the names of its
contributors may be used to endorse or promote products
derived from this software without specific prior
written permission of the ASSIMP Development Team.
written permission of the assimp team.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
Expand Down
8 changes: 4 additions & 4 deletions code/ASELoader.h
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
Open Asset Import Library (ASSIMP)
Open Asset Import Library (assimp)
----------------------------------------------------------------------
Copyright (c) 2006-2010, ASSIMP Development Team
Copyright (c) 2006-2012, assimp team
All rights reserved.
Redistribution and use of this software in source and binary forms,
Expand All @@ -18,10 +18,10 @@ following conditions are met:
following disclaimer in the documentation and/or other
materials provided with the distribution.
* Neither the name of the ASSIMP team, nor the names of its
* Neither the name of the assimp team, nor the names of its
contributors may be used to endorse or promote products
derived from this software without specific prior
written permission of the ASSIMP Development Team.
written permission of the assimp team.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
Expand Down
8 changes: 4 additions & 4 deletions code/ASEParser.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
---------------------------------------------------------------------------
Open Asset Import Library (ASSIMP)
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
Copyright (c) 2006-2010, ASSIMP Development Team
Copyright (c) 2006-2012, assimp team
All rights reserved.
Expand All @@ -20,10 +20,10 @@ conditions are met:
following disclaimer in the documentation and/or other
materials provided with the distribution.
* Neither the name of the ASSIMP team, nor the names of its
* Neither the name of the assimp team, nor the names of its
contributors may be used to endorse or promote products
derived from this software without specific prior
written permission of the ASSIMP Development Team.
written permission of the assimp team.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
Expand Down
8 changes: 4 additions & 4 deletions code/ASEParser.h
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
Open Asset Import Library (ASSIMP)
Open Asset Import Library (assimp)
----------------------------------------------------------------------
Copyright (c) 2006-2010, ASSIMP Development Team
Copyright (c) 2006-2012, assimp team
All rights reserved.
Redistribution and use of this software in source and binary forms,
Expand All @@ -18,10 +18,10 @@ following conditions are met:
following disclaimer in the documentation and/or other
materials provided with the distribution.
* Neither the name of the ASSIMP team, nor the names of its
* Neither the name of the assimp team, nor the names of its
contributors may be used to endorse or promote products
derived from this software without specific prior
written permission of the ASSIMP Development Team.
written permission of the assimp team.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
Expand Down
8 changes: 4 additions & 4 deletions code/Assimp.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
---------------------------------------------------------------------------
Open Asset Import Library (ASSIMP)
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
Copyright (c) 2006-2010, ASSIMP Development Team
Copyright (c) 2006-2012, assimp team
All rights reserved.
Expand All @@ -20,10 +20,10 @@ conditions are met:
following disclaimer in the documentation and/or other
materials provided with the distribution.
* Neither the name of the ASSIMP team, nor the names of its
* Neither the name of the assimp team, nor the names of its
contributors may be used to endorse or promote products
derived from this software without specific prior
written permission of the ASSIMP Development Team.
written permission of the assimp team.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
Expand Down
8 changes: 4 additions & 4 deletions code/AssimpCExport.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
---------------------------------------------------------------------------
Open Asset Import Library (ASSIMP)
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
Copyright (c) 2006-2010, ASSIMP Development Team
Copyright (c) 2006-2012, assimp team
All rights reserved.
Expand All @@ -20,10 +20,10 @@ conditions are met:
following disclaimer in the documentation and/or other
materials provided with the distribution.
* Neither the name of the ASSIMP team, nor the names of its
* Neither the name of the assimp team, nor the names of its
contributors may be used to endorse or promote products
derived from this software without specific prior
written permission of the ASSIMP Development Team.
written permission of the assimp team.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
Expand Down
4 changes: 2 additions & 2 deletions code/AssimpPCH.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
#include "./../include/aiVersion.h"

// --------------------------------------------------------------------------------
// Legal information string - dont't remove from image!
// Legal information string - dont't remove this.
static const char* LEGAL_INFORMATION =

"Open Asset Import Library (Assimp).\n"
"A free C/C++ library to import various 3D file formats into applications\n\n"

"(c) 2008-2010, ASSIMP Development Team\n"
"(c) 2008-2010, assimp team\n"
"License under the terms and conditions of the 3-clause BSD license\n"
"http://assimp.sourceforge.net\n"
;
Expand Down
8 changes: 4 additions & 4 deletions code/AssimpPCH.h
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
---------------------------------------------------------------------------
Open Asset Import Library (ASSIMP)
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
Copyright (c) 2006-2010, ASSIMP Development Team
Copyright (c) 2006-2012, assimp team
All rights reserved.
Expand All @@ -20,10 +20,10 @@ conditions are met:
following disclaimer in the documentation and/or other
materials provided with the distribution.
* Neither the name of the ASSIMP team, nor the names of its
* Neither the name of the assimp team, nor the names of its
contributors may be used to endorse or promote products
derived from this software without specific prior
written permission of the ASSIMP Development Team.
written permission of the assimp team.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
Expand Down
8 changes: 4 additions & 4 deletions code/B3DImporter.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
---------------------------------------------------------------------------
Open Asset Import Library (ASSIMP)
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
Copyright (c) 2006-2010, ASSIMP Development Team
Copyright (c) 2006-2012, assimp team
All rights reserved.
Expand All @@ -20,10 +20,10 @@ conditions are met:
following disclaimer in the documentation and/or other
materials provided with the distribution.
* Neither the name of the ASSIMP team, nor the names of its
* Neither the name of the assimp team, nor the names of its
contributors may be used to endorse or promote products
derived from this software without specific prior
written permission of the ASSIMP Development Team.
written permission of the assimp team.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
Expand Down
Loading

0 comments on commit 4dbf539

Please sign in to comment.