From a42718f7539b8daffde4d6d341be959a439b98b7 Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Thu, 9 Nov 2006 18:44:28 +0000 Subject: [PATCH] quickprof (optional performance tuning) changed into Zlib license,entire Bullet/src folder is Zlib again. (thanks Tyler Streeter) --- src/LinearMath/btQuickprof.cpp | 37 ++++++++++++++-------------------- src/LinearMath/btQuickprof.h | 36 +++++++++++++-------------------- 2 files changed, 29 insertions(+), 44 deletions(-) diff --git a/src/LinearMath/btQuickprof.cpp b/src/LinearMath/btQuickprof.cpp index 23b8b8b2c..4d013a658 100644 --- a/src/LinearMath/btQuickprof.cpp +++ b/src/LinearMath/btQuickprof.cpp @@ -1,25 +1,18 @@ -/************************************************************************ -* QuickProf * -* Copyright (C) 2006 * -* Tyler Streeter tylerstreeter@gmail.com * -* All rights reserved. * -* Web: http://quickprof.sourceforge.net * -* * -* This library is free software; you can redistribute it and/or * -* modify it under the terms of EITHER: * -* (1) The GNU Lesser bteral Public License as published by the Free * -* Software Foundation; either version 2.1 of the License, or (at * -* your option) any later version. The text of the GNU Lesser * -* bteral Public License is included with this library in the * -* file license-LGPL.txt. * -* (2) The BSD-style license that is included with this library in * -* the file license-BSD.txt. * -* * -* This library is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files * -* license-LGPL.txt and license-BSD.txt for more details. * -************************************************************************/ +/* +Copyright (c) 2006 Tyler Streeter + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. + +*/ + // Please visit the project website (http://quickprof.sourceforge.net) // for usage instructions. diff --git a/src/LinearMath/btQuickprof.h b/src/LinearMath/btQuickprof.h index 90e1f421f..ec560c8e3 100644 --- a/src/LinearMath/btQuickprof.h +++ b/src/LinearMath/btQuickprof.h @@ -1,26 +1,18 @@ -/************************************************************************ -* QuickProf * -* Copyright (C) 2006 * -* Tyler Streeter tylerstreeter@gmail.com * -* All rights reserved. * -* Web: http://quickprof.sourceforge.net * -* * -* This library is free software; you can redistribute it and/or * -* modify it under the terms of EITHER: * -* (1) The GNU Lesser bteral Public License as published by the Free * -* Software Foundation; either version 2.1 of the License, or (at * -* your option) any later version. The text of the GNU Lesser * -* bteral Public License is included with this library in the * -* file license-LGPL.txt. * -* (2) The BSD-style license that is included with this library in * -* the file license-BSD.txt. * -* * -* This library is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files * -* license-LGPL.txt and license-BSD.txt for more details. * -************************************************************************/ +/* +Copyright (c) 2006 Tyler Streeter +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it freely, +subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. + +*/ + // Please visit the project website (http://quickprof.sourceforge.net) // for usage instructions.