Merge branch 'develop' of github.com:DanielChappuis/reactphysics3d into develop

This commit is contained in:
Daniel Chappuis 2018-03-06 19:29:46 +01:00
commit 62bd3bc115

17
LICENSE
View File

@ -1,20 +1,17 @@
ReactPhysics3D physics library, http://code.google.com/p/reactphysics3d/ Copyright (c) 2010-2018 Daniel Chappuis http://www.reactphysics3d.com
Copyright (c) 2010-2016 Daniel Chappuis
This software is provided 'as-is', without any express or implied warranty. This software is provided 'as-is', without any express or implied
In no event will the authors be held liable for any damages arising from the warranty. In no event will the authors be held liable for any damages
use of this software. arising from the use of this software.
Permission is granted to anyone to use this software for any purpose, Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions: freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not claim 1. The origin of this software must not be misrepresented; you must not
that you wrote the original software. If you use this software in a claim that you wrote the original software. If you use this software
product, an acknowledgment in the product documentation would be in a product, an acknowledgment in the product documentation would be
appreciated but is not required. appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be 2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software. misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.